From 1e2b3b34520218d910ca72754e3eaa4dd8d7ae09 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 12 Oct 2022 18:18:54 +0800
Subject: [PATCH 01/55] =?UTF-8?q?=E4=BC=98=E5=8C=96HttpRequestHandler?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asgc/neutrino/core/web/HttpRequestHandler.java  | 13 ++++++++-----
 .../base/rest/interceptor/BaseAuthInterceptor.java  |  5 -----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java
index 65017509..2d2e0b6f 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java
@@ -40,9 +40,11 @@ import fun.asgc.neutrino.core.web.router.HttpRouteParam;
 import fun.asgc.neutrino.core.web.router.HttpRouteResult;
 import fun.asgc.neutrino.core.web.router.HttpRouterType;
 import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.*;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpResponseStatus;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Field;
@@ -117,9 +119,10 @@ public class HttpRequestHandler {
 				httpResponseWrapper.writeAndFlush();
 				return;
 			} else if(HttpRouterType.PAGE == httpRouteResult.getType()) {
-				if (!preHandle(httpRouteResult.getPageRoute(), null)) {
-					return;
-				}
+				// 静态页面无需前置拦截
+//				if (!preHandle(httpRouteResult.getPageRoute(), null)) {
+//					return;
+//				}
 
 				// 前端页面
 				String mimeType = MimeType.getMimeType(MimeType.parseSuffix(httpRouteResult.getPageLocation()));
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java
index 955c943b..40320809 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java
@@ -46,11 +46,6 @@ public class BaseAuthInterceptor implements HandlerInterceptor {
 
 	@Override
 	public boolean preHandle(HttpRequestWrapper requestParser, HttpResponseWrapper responseWrapper, String route, Method targetMethod) throws Exception {
-		// TODO 临时解决静态页面被拦截的问题
-		if (null == targetMethod) {
-			return true;
-		}
-
 		SystemContext systemContext = new SystemContext();
 		SystemContextHolder.set(systemContext);
 		systemContext.setIp(HttpUtil.getIP(HttpContextHolder.getChannelHandlerContext(), requestParser));

From 8baf7f3a370526773418553d4596baae4f6ecbc6 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 12 Oct 2022 18:41:26 +0800
Subject: [PATCH 02/55] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=A2=9Elicen?=
 =?UTF-8?q?se=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fun/asgc/neutrino/proxy/server/service/LicenseService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
index 0895ad95..a744706c 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
@@ -103,7 +103,7 @@ public class LicenseService {
 	 */
 	public LicenseCreateRes create(LicenseCreateReq req) {
 		LicenseDO licenseDO = licenseMapper.checkRepeat(req.getUserId(), req.getName());
-		ParamCheckUtil.checkNotNull(licenseDO, ExceptionConstant.LICENSE_NAME_CANNOT_REPEAT);
+		ParamCheckUtil.checkExpression(null == licenseDO, ExceptionConstant.LICENSE_NAME_CANNOT_REPEAT);
 
 		String key = UUID.randomUUID().toString().replaceAll("-", "");
 		Date now = new Date();

From 5a928d16605ed93f0d93da9b218a844c31ade151 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 12 Oct 2022 19:11:03 +0800
Subject: [PATCH 03/55] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=98=A0=E5=B0=84=E6=8A=A5=E9=94=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asgc/neutrino/proxy/server/service/PortMappingService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
index fd9843f3..0aa5e03e 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
@@ -107,7 +107,7 @@ public class PortMappingService {
 		}
 		PortPoolDO portPoolDO = portPoolMapper.findByPort(req.getServerPort());
 		ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
-		ParamCheckUtil.checkNotNull(portMappingMapper.findByPort(req.getServerPort()), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
+		ParamCheckUtil.checkExpression(null == portMappingMapper.findByPort(req.getServerPort()), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
 
 
 		Date now = new Date();

From 94fe6f8aef4dbba2eee396bf64750cec3849a563 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 12 Oct 2022 20:28:24 +0800
Subject: [PATCH 04/55] =?UTF-8?q?=E8=A7=A3=E5=86=B3license=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E7=AE=A1=E7=90=86=E5=BC=82=E5=B8=B8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/PortMappingService.java    | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
index 0aa5e03e..ac06c7f0 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
@@ -74,27 +74,34 @@ public class PortMappingService {
 	public Page<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq req) {
 		Page<PortMappingListRes> page = Page.create(pageQuery);
 		portMappingMapper.page(page, req);
-		if (!CollectionUtil.isEmpty(page.getRecords())) {
-			Set<Integer> licenseIds = page.getRecords().stream().map(PortMappingListRes::getLicenseId).collect(Collectors.toSet());
-			List<LicenseDO> licenseList = licenseMapper.findByIds(licenseIds);
-			Set<Integer> userIds = licenseList.stream().map(LicenseDO::getUserId).collect(Collectors.toSet());
-			List<UserDO> userList = userMapper.findByIds(userIds);
-			Map<Integer, LicenseDO> licenseMap = licenseList.stream().collect(Collectors.toMap(LicenseDO::getId, Function.identity()));
-			Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
-			page.getRecords().forEach(item -> {
-				LicenseDO license = licenseMap.get(item.getLicenseId());
-				if (null == license) {
-					return;
-				}
-				item.setLicenseName(license.getName());
-				item.setUserId(license.getUserId());
-				UserDO user = userMap.get(license.getUserId());
-				if (null == user) {
-					return;
-				}
-				item.setUserName(user.getName());
-			});
+		if (CollectionUtil.isEmpty(page.getRecords())) {
+			return page;
 		}
+		Set<Integer> licenseIds = page.getRecords().stream().map(PortMappingListRes::getLicenseId).collect(Collectors.toSet());
+		if (CollectionUtil.isEmpty(licenseIds)) {
+			return page;
+		}
+		List<LicenseDO> licenseList = licenseMapper.findByIds(licenseIds);
+		if (CollectionUtil.isEmpty(licenseList)) {
+			return page;
+		}
+		Set<Integer> userIds = licenseList.stream().map(LicenseDO::getUserId).collect(Collectors.toSet());
+		List<UserDO> userList = userMapper.findByIds(userIds);
+		Map<Integer, LicenseDO> licenseMap = licenseList.stream().collect(Collectors.toMap(LicenseDO::getId, Function.identity()));
+		Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
+		page.getRecords().forEach(item -> {
+			LicenseDO license = licenseMap.get(item.getLicenseId());
+			if (null == license) {
+				return;
+			}
+			item.setLicenseName(license.getName());
+			item.setUserId(license.getUserId());
+			UserDO user = userMap.get(license.getUserId());
+			if (null == user) {
+				return;
+			}
+			item.setUserName(user.getName());
+		});
 		return page;
 	}
 
@@ -196,8 +203,7 @@ public class PortMappingService {
 		ParamCheckUtil.checkNotNull(portMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
 
 		LicenseDO licenseDO = licenseMapper.findById(portMappingDO.getLicenseId());
-		ParamCheckUtil.checkNotNull(licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
-		if (!SystemContextHolder.isAdmin()) {
+		if (null != licenseDO && !SystemContextHolder.isAdmin()) {
 			// 临时处理，如果当前用户不是管理员，则操作userId不能为1
 			ParamCheckUtil.checkExpression(!licenseDO.getUserId().equals(1), ExceptionConstant.NO_PERMISSION_VISIT);
 		}

From 7fa4d6d8fa1c67f183a8691fb4275ffe5402b4e7 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 13 Oct 2022 23:14:34 +0800
Subject: [PATCH 05/55] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asgc/neutrino/proxy/server/service/PortMappingService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
index ac06c7f0..fea4edce 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
@@ -140,7 +140,7 @@ public class PortMappingService {
 		}
 		PortPoolDO portPoolDO = portPoolMapper.findByPort(req.getServerPort());
 		ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
-		ParamCheckUtil.checkNotNull(portMappingMapper.findByPort(req.getServerPort(), Sets.newHashSet(req.getId())), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
+		ParamCheckUtil.checkExpression(null == portMappingMapper.findByPort(req.getServerPort(), Sets.newHashSet(req.getId())), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
 
 		PortMappingDO portMappingDO = new PortMappingDO();
 		portMappingDO.setId(req.getId());

From 47be82ba95601eed44901a54cf6df854e7a92638 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 14 Oct 2022 17:42:34 +0800
Subject: [PATCH 06/55] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/proxy/handler/ProxyMessageAuthHandler.java  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
index f1afecfb..ed8ec681 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
@@ -86,30 +86,25 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler {
 		String licenseKey = proxyMessage.getInfo();
 		if (StringUtil.isEmpty(licenseKey)) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license不能为空!", licenseKey));
-//			ctx.channel().close();
 			return;
 		}
 		LicenseDO licenseDO = licenseService.findByKey(licenseKey);
 		if (null == licenseDO) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license不存在!", licenseKey));
-//			ctx.channel().close();
 			return;
 		}
 		if (EnableStatusEnum.DISABLE.getStatus().equals(licenseDO.getEnable())) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license已被禁用!", licenseKey));
-//			ctx.channel().close();
 			return;
 		}
 		UserDO userDO = userService.findById(licenseDO.getId());
 		if (null == userDO || EnableStatusEnum.DISABLE.getStatus().equals(userDO.getEnable())) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license无效!", licenseKey));
-//			ctx.channel().close();
 			return;
 		}
 		Channel cmdChannel = ProxyUtil.getCmdChannelByLicenseId(licenseDO.getId());
 		if (null != cmdChannel) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license已被另一节点使用!", licenseKey));
-//			ctx.channel().close();
 			return;
 		}
 		// 发送认证成功消息

From 033196d955032b3fec8428ae6da05d9777c1571f Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 14 Oct 2022 22:04:08 +0800
Subject: [PATCH 07/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E9=A1=B5=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/views/proxy/license.vue     | 2 +-
 neutrino-proxy-admin/src/views/proxy/portMapping.vue | 2 +-
 neutrino-proxy-admin/src/views/system/jobLog.vue     | 2 +-
 neutrino-proxy-admin/src/views/system/jobManager.vue | 2 +-
 neutrino-proxy-admin/src/views/system/portPool.vue   | 2 +-
 neutrino-proxy-admin/src/views/system/user.vue       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/neutrino-proxy-admin/src/views/proxy/license.vue b/neutrino-proxy-admin/src/views/proxy/license.vue
index a116799f..64c0bb39 100644
--- a/neutrino-proxy-admin/src/views/proxy/license.vue
+++ b/neutrino-proxy-admin/src/views/proxy/license.vue
@@ -133,7 +133,7 @@
         listLoading: true,
         listQuery: {
           currentPage: 1,
-          pageSize: 20,
+          pageSize: 10,
           importance: undefined,
           title: undefined,
           type: undefined
diff --git a/neutrino-proxy-admin/src/views/proxy/portMapping.vue b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
index 3730df9a..ad46866a 100644
--- a/neutrino-proxy-admin/src/views/proxy/portMapping.vue
+++ b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
@@ -172,7 +172,7 @@
         listLoading: true,
         listQuery: {
           currentPage: 1,
-          pageSize: 20,
+          pageSize: 10,
           importance: undefined,
           title: undefined,
           type: undefined
diff --git a/neutrino-proxy-admin/src/views/system/jobLog.vue b/neutrino-proxy-admin/src/views/system/jobLog.vue
index 94340f77..ffffebd4 100644
--- a/neutrino-proxy-admin/src/views/system/jobLog.vue
+++ b/neutrino-proxy-admin/src/views/system/jobLog.vue
@@ -71,7 +71,7 @@ export default {
       listLoading: false,
       listQuery: {
         currentPage: 1,
-        pageSize: 20,
+        pageSize: 10,
         jobId: undefined
       },
       jobList: []
diff --git a/neutrino-proxy-admin/src/views/system/jobManager.vue b/neutrino-proxy-admin/src/views/system/jobManager.vue
index 1521f03d..8b62a349 100644
--- a/neutrino-proxy-admin/src/views/system/jobManager.vue
+++ b/neutrino-proxy-admin/src/views/system/jobManager.vue
@@ -115,7 +115,7 @@
         listLoading: true,
         listQuery: {
           currentPage: 1,
-          pageSize: 20,
+          pageSize: 10,
           importance: undefined,
           title: undefined,
           type: undefined
diff --git a/neutrino-proxy-admin/src/views/system/portPool.vue b/neutrino-proxy-admin/src/views/system/portPool.vue
index 2bb4fcbe..134f4512 100644
--- a/neutrino-proxy-admin/src/views/system/portPool.vue
+++ b/neutrino-proxy-admin/src/views/system/portPool.vue
@@ -108,7 +108,7 @@
         listLoading: true,
         listQuery: {
           currentPage: 1,
-          pageSize: 20,
+          pageSize: 10,
           importance: undefined,
           title: undefined,
           type: undefined
diff --git a/neutrino-proxy-admin/src/views/system/user.vue b/neutrino-proxy-admin/src/views/system/user.vue
index 9a030fc5..9b20d580 100644
--- a/neutrino-proxy-admin/src/views/system/user.vue
+++ b/neutrino-proxy-admin/src/views/system/user.vue
@@ -119,7 +119,7 @@
         listLoading: true,
         listQuery: {
           currentPage: 1,
-          pageSize: 20,
+          pageSize: 10,
           importance: undefined,
           title: undefined,
           type: undefined

From d00346a3768738507b0d296ac6c38903666beade Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 14 Oct 2022 22:16:05 +0800
Subject: [PATCH 08/55] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E5=AE=BD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/views/system/jobManager.vue |  2 +-
 neutrino-proxy-admin/src/views/system/portPool.vue   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/neutrino-proxy-admin/src/views/system/jobManager.vue b/neutrino-proxy-admin/src/views/system/jobManager.vue
index 8b62a349..a76755ec 100644
--- a/neutrino-proxy-admin/src/views/system/jobManager.vue
+++ b/neutrino-proxy-admin/src/views/system/jobManager.vue
@@ -41,7 +41,7 @@
           <el-button size="mini" type="text" @click="handleLogClick(scope.row)">查看</el-button>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
+      <el-table-column align="center" :label="$t('table.actions')" min-width="230" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="primary" @click="handleEditClick(scope.row)">编辑</el-button>
           <el-button size="mini" type="primary" @click="handleExecuteClick(scope.row)">执行</el-button>
diff --git a/neutrino-proxy-admin/src/views/system/portPool.vue b/neutrino-proxy-admin/src/views/system/portPool.vue
index 134f4512..bd195521 100644
--- a/neutrino-proxy-admin/src/views/system/portPool.vue
+++ b/neutrino-proxy-admin/src/views/system/portPool.vue
@@ -7,7 +7,7 @@
 
     <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row
               style="width: 100%">
-      <el-table-column align="center" :label="$t('table.id')" width="100">
+      <el-table-column align="center" :label="$t('table.id')" width="120">
         <template slot-scope="scope">
           <span>{{scope.row.id}}</span>
         </template>
@@ -17,22 +17,22 @@
           <span>{{scope.row.port}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="150px" align="center" :label="$t('table.createTime')">
+      <el-table-column width="200" align="center" :label="$t('table.createTime')">
         <template slot-scope="scope">
           <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="150px" align="center" :label="$t('table.updateTime')">
+      <el-table-column width="200" align="center" :label="$t('table.updateTime')">
         <template slot-scope="scope">
           <span>{{scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
         </template>
       </el-table-column>
-      <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="100">
+      <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="150">
         <template slot-scope="scope">
           <el-tag :type="scope.row.enable | statusFilter">{{scope.row.enable | statusName}}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
+      <el-table-column align="center" :label="$t('table.actions')" width="250" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-if="scope.row.enable =='1'" size="mini" type="danger" @click="handleModifyStatus(scope.row,2)">{{$t('table.disable')}}</el-button>
           <el-button v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row,1)">{{$t('table.enable')}}</el-button>

From f43f46fe9e8a9fe8e8b0cfba88e18407d820f8ec Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sat, 15 Oct 2022 22:59:20 +0800
Subject: [PATCH 09/55] =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/client/core/ApplicationLifeCycleListener.java   | 1 +
 .../neutrino/proxy/client/core/LicenseObtainService.java  | 2 +-
 .../neutrino/proxy/client/core/ProxyClientService.java    | 8 ++++----
 .../proxy/client/handler/ProxyMessageAuthHandler.java     | 2 +-
 .../proxy/client/handler/ProxyMessageConnectHandler.java  | 2 +-
 .../client/handler/ProxyMessageDisconnectHandler.java     | 2 +-
 .../proxy/client/handler/ProxyMessageErrorHandler.java    | 2 +-
 .../proxy/client/handler/ProxyMessageTransferHandler.java | 2 +-
 .../fun/asgc/neutrino/proxy/client/util/ProxyUtil.java    | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ApplicationLifeCycleListener.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ApplicationLifeCycleListener.java
index 686d97fc..23a26651 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ApplicationLifeCycleListener.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ApplicationLifeCycleListener.java
@@ -32,6 +32,7 @@ import fun.asgc.neutrino.core.constant.MetaDataConstant;
 import lombok.extern.slf4j.Slf4j;
 
 /**
+ * 应用生命周期事件监听器
  * @author: aoshiguchen
  * @date: 2022/10/10
  */
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
index 350212e7..93d37cd0 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- *
+ * license获取服务
  * @author: aoshiguchen
  * @date: 2022/9/4
  */
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
index 56aca03a..46db8615 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
@@ -26,13 +26,14 @@ import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Bean;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
-import fun.asgc.neutrino.core.context.ApplicationRunner;
 import fun.asgc.neutrino.core.context.Environment;
 import fun.asgc.neutrino.core.util.FileUtil;
 import fun.asgc.neutrino.core.util.StringUtil;
 import fun.asgc.neutrino.proxy.client.config.ProxyConfig;
 import fun.asgc.neutrino.proxy.client.util.ProxyUtil;
-import fun.asgc.neutrino.proxy.core.*;
+import fun.asgc.neutrino.proxy.core.ProxyMessage;
+import fun.asgc.neutrino.proxy.core.ProxyMessageDecoder;
+import fun.asgc.neutrino.proxy.core.ProxyMessageEncoder;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -48,10 +49,9 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import java.io.InputStream;
 import java.security.KeyStore;
-import java.util.Scanner;
 
 /**
- *
+ * 客户端服务
  * @author: aoshiguchen
  * @date: 2022/6/16
  */
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java
index 9cffebfe..6e70cb21 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java
@@ -37,7 +37,7 @@ import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- *
+ * 认证信息处理器
  * @author: aoshiguchen
  * @date: 2022/9/4
  */
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java
index 44fbae9c..59a2d983 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java
@@ -34,7 +34,7 @@ import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
 
 /**
- *
+ * 连接信息处理器
  * @author: aoshiguchen
  * @date: 2022/6/16
  */
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageDisconnectHandler.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageDisconnectHandler.java
index e916f0f3..8dba2275 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageDisconnectHandler.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageDisconnectHandler.java
@@ -36,7 +36,7 @@ import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 
 /**
- *
+ * 断开连接信息处理器
  * @author: aoshiguchen
  * @date: 2022/6/16
  */
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageErrorHandler.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageErrorHandler.java
index 492f658c..a79ce5f1 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageErrorHandler.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageErrorHandler.java
@@ -31,7 +31,7 @@ import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- *
+ * 异常信息处理器
  * @author: aoshiguchen
  * @date: 2022/6/16
  */
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageTransferHandler.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageTransferHandler.java
index 93fd7ae5..5a503ee0 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageTransferHandler.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageTransferHandler.java
@@ -34,7 +34,7 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 
 /**
- *
+ * 传输信息处理器
  * @author: aoshiguchen
  * @date: 2022/6/16
  */
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java
index 34472483..fe59c4af 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java
@@ -38,7 +38,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 /**
- *
+ * 代理工具
  * @author: aoshiguchen
  * @date: 2022/8/31
  */

From ded5e2f92701d0c7a9c9de9ea190ea8a9afdf416 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sun, 16 Oct 2022 16:45:27 +0800
Subject: [PATCH 10/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=8F=E8=BF=B0=E4=BB=A3=E7=90=86=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E3=80=81=E6=95=B0=E6=8D=AE=E6=B5=81=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  1 +
 docs/Channel.MD                               | 54 +++++++++++++++++++
 .../handler/ProxyMessageConnectHandler.java   |  1 +
 3 files changed, 56 insertions(+)
 create mode 100644 docs/Channel.MD

diff --git a/README.md b/README.md
index f9e663ed..106ee7f3 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,7 @@ proxy:
 
 # 7、技术文档
 - [Aop](./docs/Aop.MD)
+- [Channel](./docs/Channel.MD)
 
 # 8、联系我们
 - 微信: yuyunshize
diff --git a/docs/Channel.MD b/docs/Channel.MD
new file mode 100644
index 00000000..b28985cc
--- /dev/null
+++ b/docs/Channel.MD
@@ -0,0 +1,54 @@
+# 代理实现中涉及的几类Channel
+
+## 指令通道(CmdChannel)
+- 该channel负责维护客户端与服务端之间的指令通讯，由客户端启动后向服务端发起连接请求，服务端验证license成功后连接建立。
+- 服务端维护第一个CmdChannel的映射表，key为licenseId。服务端可以根据licenseId，向指定的客户端指令通道发布指令。
+- 该通道建立完成后，服务端会将该license授权的外网映射端口打开，等待用户访问。正常情况下，只要客户端不下线，该通道一直可用。
+- 然后服务端维护第二个CmdChannel的映射表，key为服务端外网端口。服务端可以根据指定的外网端口，向指定的客户端指令通道发布指令。
+
+## 用户访问通道(VisitorChannel)
+- 该channel负责维护访问者与服务端端口之间的通讯，由访问者向服务端映射的外网端口发起请求开始建立，具体断开时机由实际的被代理的
+协议决定。
+- 如HTTP/1.0下，用户向该端口发起请求，响应结束后，该通道随之关闭，下一次发起请求后，重新建立新的连接。
+- 该连接建立后，服务端会向该外网端口映射的指令通道发送`Connect`指令,传输该外网端口需要代理的内网信息，
+如：`127.0.0.1:3306`。
+
+## 被代理服务的实际通道(RealServerChannel)
+- 该channel负责维护客户端与实际被代理服务之间的通讯，当客户端接收到服务端的`Connect`指令后，客户端便会建立该通道。
+
+## 代理数据传输的通道(ProxyChannel)
+- 该channel负责完成内网被代理服务与代理服务端之间的数据转发任务。
+- 每个客户端维护一个`ProxyChannel`的缓存队列，需要时从该队列中取，当取不到是，直接新建一个`ProxyChannel`返回。
+当一个`ProxyChannel`实例用完后，需要归还到缓存队列中(`ProxyChannel`收到`DisConnect`指令时)。
+- 当`RealServerChannel`建立完成后，就会获取一个`ProxyChannel`,并绑定对应的`RealServerChannel`,并设置`RealServerChannel`为
+可读状态。然后通过`ProxyChannel`向服务端发送`Connect`指令。
+
+
+# 代理实现流程
+## 1、服务连接阶段
+- 1.1、客户端根据是否需要使用SSL，选择对应的服务端端口发起连接，建立`CmdChannel`。
+- 1.2、客户端根据用户输入或配置文件获取`license`,并携带`license`通过`CmdChannel`向服务端发送`Auth`指令。
+- 1.3、服务端通过`CmdChannel`接收到来自客户端的`Auth`指令。若验证`license`有效，则建立`licenseId`与`CmdChannel`的映射缓存、
+外网端口与`CmdChannel`的映射缓存。并启动服务端代理端口，等待用户连接。
+## 2、用户连接阶段
+- 2.1、用户访向服务端代理的外网端口发起请求，服务端建立`VisitorChannel`。
+- 2.2、根据外网端口查找`CmdChannel`，若不存在有效的`CmdChannel`，则关闭该`VisitorChannel`。否则，
+设置`VisitorChannel`为不可读，并携带内网映射信息(如：`127.0.0.1:3306`)通过`CmdChannel`向客户端发送`Connect`指令。
+## 3、实际被代理服务连接阶段
+- 3.1、客户端通过`CmdChannel`接收到服务端的`Connect`指令。拿到需要代理的内网IP、端口号，向实际被
+代理服务发起连接请求，若连接失败，则通过`CmdChannel`向服务端发送`DisConnect`指令。建立`RealServerChannel`成功，设置`RealServerChannel`为不可读
+状态，并进入4.1阶段
+## 4、代理通道连接阶段
+- 4.1、客户端通过`ProxyChannelQueue`获取或新建一个`ProxyChannel`，并将`RealServerChannel`与`ProxyChannel`进行绑定。
+- 4.2、客户端通过`ProxyChannel`向服务端发送`Connect`指令。
+- 4.3、服务端通过`ProxyChannel`通道收到来自客户端的`Connect`指令后，将`ProxyChannel`与对应的`VisitorChannel`进行绑定，并
+设置`VisitorChannel`为可读状态。
+## 5、数据传输阶段
+- 5.1、服务端通过`VisitorChannel`收到来自用户的请求数据，然后找到`VisitorChannel`绑定的`ProxyChannel`，
+通过`ProxyChannel`发送`Transfer`指令，并携带用户请求数据。
+- 5.2、客户端通过`ProxyChannel`收到来自服务端的`Transfer`指令，取出用户请求数据。找到`ProxyChannel`绑定的`RealServerChannel`,
+通过`RealServerChannel`向被代理服务写入用户请求数据。
+- 5.3、客户端通过`RealServerChannel`收到被代理服务响应的数据，找到`RealServerChannel`绑定的`ProxyChannel`，
+通过`ProxyChannel`向服务端发送`Transfer`指令，并携带响应数据。
+- 5.4、服务端通过`ProxyChannel`收到来自客户端的`Transfer`指令，找到`ProxyChannel`绑定的`VisitorChannel`，
+通过`VisitorChannel`向用户端写入响应数据。
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java
index 59a2d983..7cd3e13a 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java
@@ -54,6 +54,7 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 		String[] serverInfo = new String(proxyMessage.getData()).split(":");
 		String ip = serverInfo[0];
 		int port = Integer.parseInt(serverInfo[1]);
+		// 连接真实的、被代理的服务
 		realServerBootstrap.connect(ip, port).addListener(new ChannelFutureListener() {
 
 			@Override

From 80573ee718fee09dddaa0bc0e30a6b47a81c4491 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 17 Oct 2022 21:48:57 +0800
Subject: [PATCH 11/55] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 +
 .../client/core/LicenseObtainService.java     | 101 +++++++++++++++---
 .../proxy/client/core/ProxyClientService.java |   5 +-
 3 files changed, 90 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 979b4ad5..d1f28b7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.class
 data.db*
 .neutrino-proxy.license
+.neutrino-proxy-client.config
 lib/*
 
 
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
index 93d37cd0..bb07c725 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
@@ -21,6 +21,8 @@
  */
 package fun.asgc.neutrino.proxy.client.core;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
@@ -30,8 +32,11 @@ import fun.asgc.neutrino.core.util.ArrayUtil;
 import fun.asgc.neutrino.core.util.FileUtil;
 import fun.asgc.neutrino.core.util.StringUtil;
 import fun.asgc.neutrino.proxy.client.config.ProxyConfig;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Scanner;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -82,29 +87,97 @@ public class LicenseObtainService {
 	}
 
 	public void process(String[] args) {
-		String licenseKey = getLicenseKey(args);
-		proxyClientService.start(licenseKey);
+		CustomConfig customConfig = getCustomConfigByCliParams(args);
+		proxyConfig.getClient().setJksPath(customConfig.getJksPath());
+		proxyConfig.getClient().setServerIp(customConfig.getServerIp());
+		proxyConfig.getClient().setServerPort(customConfig.getServerPort());
+		proxyConfig.getClient().setSslEnable(customConfig.getSslEnable());
+		proxyConfig.setLicenseKey(customConfig.getLicenseKey());
+		proxyClientService.start();
 	}
 
-	private String getLicenseKey(String[] args) {
-		String license = "";
-		if (null != args && ArrayUtil.notEmpty(args)) {
-			for (String s : args) {
-				if (s.startsWith("license=") && s.length() > 8) {
-					license = s.substring(8).trim();
-					break;
-				}
-			}
+	private CustomConfig getCustomConfigByCliParams(String[] args) {
+		CustomConfig customConfig = new CustomConfig();
+		// 默认无需输入
+		customConfig.setJksPath(proxyConfig.getClient().getJksPath());
+		customConfig.setServerIp(proxyConfig.getClient().getServerIp());
+		customConfig.setServerPort(proxyConfig.getClient().getServerPort());
+		customConfig.setSslEnable(proxyConfig.getClient().getSslEnable());
+		// 从cli参数中取
+		Map<String, String> cliParams = getCliParams(args);
+		if (cliParams.containsKey("jksPath")) {
+			customConfig.setJksPath(cliParams.get("jksPath"));
 		}
-		if (StringUtil.isEmpty(license)) {
-			license = FileUtil.readContentAsString("./.neutrino-proxy.license");
+		if (cliParams.containsKey("serverIp")) {
+			customConfig.setServerIp(cliParams.get("serverIp"));
+		}
+		if (cliParams.containsKey("serverPort")) {
+			customConfig.setServerPort(Integer.valueOf(cliParams.get("serverPort")));
+		}
+		if (cliParams.containsKey("sslEnable")) {
+			customConfig.setSslEnable(Boolean.valueOf(cliParams.get("sslEnable")));
+		}
+		if (cliParams.containsKey("licenseKey")) {
+			customConfig.setLicenseKey(cliParams.get("licenseKey"));
+		}
+		if (StringUtil.notEmpty(customConfig.getLicenseKey())) {
+			FileUtil.write("./.neutrino-proxy-client.config", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
+			return customConfig;
 		}
 
+		String config = FileUtil.readContentAsString("./.neutrino-proxy-client.config");
+		if (StringUtil.notEmpty(config)) {
+			try {
+				customConfig = JSONObject.parseObject(config, CustomConfig.class);
+			} catch (Exception e) {
+				log.error("配置异常!", e);
+			}
+			if (StringUtil.notEmpty(customConfig.getLicenseKey())) {
+				FileUtil.write("./.neutrino-proxy-client.config", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
+				return customConfig;
+			}
+		}
+
+		String license = "";
 		while (StringUtil.isEmpty(license)) {
 			System.out.print("请输入license:");
 			license = scanner.next();
 		}
+		customConfig.setLicenseKey(license);
+		FileUtil.write("./.neutrino-proxy-client.config", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
 
-		return license;
+		return customConfig;
+	}
+
+	/**
+	 * 获取命令行参数
+	 * @param args
+	 * @return
+	 */
+	private Map<String, String> getCliParams(String[] args) {
+		Map<String, String> res = new HashMap<>();
+		if (ArrayUtil.notEmpty(args)) {
+			for (String item : args) {
+				if (StringUtil.isEmpty(item) || !item.contains("=")) {
+					continue;
+				}
+				int index = item.indexOf("=");
+				if (index <= 0 || index == item.length() - 1) {
+					continue;
+				}
+				res.put(item.substring(0, index), item.substring(index + 1));
+			}
+		}
+
+		return res;
+	}
+
+	@Data
+	public static class CustomConfig {
+		private String jksPath;
+		private String serverIp;
+		private Integer serverPort;
+		private Boolean sslEnable;
+		private String licenseKey;
 	}
 }
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
index 46db8615..85c95677 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
@@ -70,11 +70,10 @@ public class ProxyClientService {
 	private Environment environment;
 	private volatile Channel channel;
 
-	public void start(String licenseKey) {
-		if (StringUtil.isEmpty(licenseKey)) {
+	public void start() {
+		if (StringUtil.isEmpty(proxyConfig.getLicenseKey())) {
 			return;
 		}
-		proxyConfig.setLicenseKey(licenseKey);
 		if (null == channel || !channel.isActive()) {
 			connectProxyServer();
 		} else {

From 4d4aeaf8fc0cad6cbe01d0e51456e0245745e457 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Tue, 18 Oct 2022 17:54:52 +0800
Subject: [PATCH 12/55] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                | 2 +-
 .neutrino-proxy-client.json                               | 7 +++++++
 .../neutrino/proxy/client/core/LicenseObtainService.java  | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 .neutrino-proxy-client.json

diff --git a/.gitignore b/.gitignore
index d1f28b7e..83909f75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 *.class
 data.db*
 .neutrino-proxy.license
-.neutrino-proxy-client.config
+.neutrino-proxy-client.json
 lib/*
 
 
diff --git a/.neutrino-proxy-client.json b/.neutrino-proxy-client.json
new file mode 100644
index 00000000..85b0517b
--- /dev/null
+++ b/.neutrino-proxy-client.json
@@ -0,0 +1,7 @@
+{
+	"jksPath":"classpath:/test.jks",
+	"licenseKey":"9495b00018fd4d2eac4d485a4c923b6d",
+	"serverIp":"1.15.57.136",
+	"serverPort":9002,
+	"sslEnable":true
+}
\ No newline at end of file
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
index bb07c725..6b523a3e 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
@@ -121,11 +121,11 @@ public class LicenseObtainService {
 			customConfig.setLicenseKey(cliParams.get("licenseKey"));
 		}
 		if (StringUtil.notEmpty(customConfig.getLicenseKey())) {
-			FileUtil.write("./.neutrino-proxy-client.config", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
+			FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
 			return customConfig;
 		}
 
-		String config = FileUtil.readContentAsString("./.neutrino-proxy-client.config");
+		String config = FileUtil.readContentAsString("./.neutrino-proxy-client.json");
 		if (StringUtil.notEmpty(config)) {
 			try {
 				customConfig = JSONObject.parseObject(config, CustomConfig.class);
@@ -133,7 +133,7 @@ public class LicenseObtainService {
 				log.error("配置异常!", e);
 			}
 			if (StringUtil.notEmpty(customConfig.getLicenseKey())) {
-				FileUtil.write("./.neutrino-proxy-client.config", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
+				FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
 				return customConfig;
 			}
 		}
@@ -144,7 +144,7 @@ public class LicenseObtainService {
 			license = scanner.next();
 		}
 		customConfig.setLicenseKey(license);
-		FileUtil.write("./.neutrino-proxy-client.config", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
+		FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
 
 		return customConfig;
 	}

From 81b9dcf6c4d2e60ffdfc17c7ecb9557a1d0d61eb Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Tue, 18 Oct 2022 17:56:19 +0800
Subject: [PATCH 13/55] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .neutrino-proxy-client.json | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .neutrino-proxy-client.json

diff --git a/.neutrino-proxy-client.json b/.neutrino-proxy-client.json
deleted file mode 100644
index 85b0517b..00000000
--- a/.neutrino-proxy-client.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"jksPath":"classpath:/test.jks",
-	"licenseKey":"9495b00018fd4d2eac4d485a4c923b6d",
-	"serverIp":"1.15.57.136",
-	"serverPort":9002,
-	"sslEnable":true
-}
\ No newline at end of file

From 7db85e63795125282af9240ca75cd71744044ba1 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Tue, 18 Oct 2022 18:10:02 +0800
Subject: [PATCH 14/55] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/client/config/CustomConfig.java     | 37 +++++++++++++++++++
 .../proxy/client/config/ProxyConfig.java      |  1 +
 .../client/core/LicenseObtainService.java     | 19 +++-------
 .../handler/ProxyMessageAuthHandler.java      |  6 ++-
 4 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/CustomConfig.java

diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/CustomConfig.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/CustomConfig.java
new file mode 100644
index 00000000..4741d305
--- /dev/null
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/CustomConfig.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.client.config;
+
+import lombok.Data;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/18
+ */
+@Data
+public class CustomConfig {
+    private String jksPath;
+    private String serverIp;
+    private Integer serverPort;
+    private Boolean sslEnable;
+    private String licenseKey;
+}
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java
index e81feb13..d5622f26 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java
@@ -39,6 +39,7 @@ public class ProxyConfig {
 	private Protocol protocol;
 	private Client client;
 	private String licenseKey;
+	private CustomConfig customConfig;
 	public static volatile boolean authSuccess;
 
 	@Data
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
index 6b523a3e..ec14c39a 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/LicenseObtainService.java
@@ -22,7 +22,6 @@
 package fun.asgc.neutrino.proxy.client.core;
 
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
@@ -31,8 +30,8 @@ import fun.asgc.neutrino.core.context.Environment;
 import fun.asgc.neutrino.core.util.ArrayUtil;
 import fun.asgc.neutrino.core.util.FileUtil;
 import fun.asgc.neutrino.core.util.StringUtil;
+import fun.asgc.neutrino.proxy.client.config.CustomConfig;
 import fun.asgc.neutrino.proxy.client.config.ProxyConfig;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;
@@ -93,6 +92,7 @@ public class LicenseObtainService {
 		proxyConfig.getClient().setServerPort(customConfig.getServerPort());
 		proxyConfig.getClient().setSslEnable(customConfig.getSslEnable());
 		proxyConfig.setLicenseKey(customConfig.getLicenseKey());
+		proxyConfig.setCustomConfig(customConfig);
 		proxyClientService.start();
 	}
 
@@ -121,7 +121,7 @@ public class LicenseObtainService {
 			customConfig.setLicenseKey(cliParams.get("licenseKey"));
 		}
 		if (StringUtil.notEmpty(customConfig.getLicenseKey())) {
-			FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
+//			FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
 			return customConfig;
 		}
 
@@ -133,7 +133,7 @@ public class LicenseObtainService {
 				log.error("配置异常!", e);
 			}
 			if (StringUtil.notEmpty(customConfig.getLicenseKey())) {
-				FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
+//				FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
 				return customConfig;
 			}
 		}
@@ -144,7 +144,7 @@ public class LicenseObtainService {
 			license = scanner.next();
 		}
 		customConfig.setLicenseKey(license);
-		FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
+//		FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(customConfig, SerializerFeature.PrettyFormat));
 
 		return customConfig;
 	}
@@ -171,13 +171,4 @@ public class LicenseObtainService {
 
 		return res;
 	}
-
-	@Data
-	public static class CustomConfig {
-		private String jksPath;
-		private String serverIp;
-		private Integer serverPort;
-		private Boolean sslEnable;
-		private String licenseKey;
-	}
 }
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java
index 6e70cb21..dd7e148e 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java
@@ -22,6 +22,7 @@
 package fun.asgc.neutrino.proxy.client.handler;
 
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Match;
@@ -48,17 +49,18 @@ import lombok.extern.slf4j.Slf4j;
 public class ProxyMessageAuthHandler implements ProxyMessageHandler {
 	@Autowired
 	private LicenseObtainService licenseObtainService;
+	@Autowired
+	private ProxyConfig proxyConfig;
 
 	@Override
 	public void handle(ChannelHandlerContext context, ProxyMessage proxyMessage) {
 		String info = proxyMessage.getInfo();
 		JSONObject data = JSONObject.parseObject(info);
 		Integer code = data.getInteger("code");
-		String licenseKey = data.getString("licenseKey");
 		log.info("认证结果:{}", info);
 		if (ExceptionEnum.SUCCESS.getCode().equals(code)) {
 			ProxyConfig.authSuccess = true;
-			FileUtil.write("./.neutrino-proxy.license", licenseKey);
+			FileUtil.write("./.neutrino-proxy-client.json", JSONObject.toJSONString(proxyConfig.getCustomConfig(), SerializerFeature.PrettyFormat));
 			licenseObtainService.stop();
 		}
 	}

From 87d6e0a07d5fcd9a2204feee9ea3fc0097beefd0 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 19 Oct 2022 23:00:55 +0800
Subject: [PATCH 15/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BF=81=E7=A7=BB=E8=87=B3=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/lang/zh.js           |   4 +-
 neutrino-proxy-admin/src/router/index.js      |  17 +-
 .../src/views/{system => log}/jobLog.vue      |   0
 .../src/views/log/loginLog.vue                | 157 ++++++++++++++++++
 .../src/views/system/jobManager.vue           |   2 +-
 5 files changed, 176 insertions(+), 4 deletions(-)
 rename neutrino-proxy-admin/src/views/{system => log}/jobLog.vue (100%)
 create mode 100644 neutrino-proxy-admin/src/views/log/loginLog.vue

diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js
index 63096fa8..8f814ae9 100644
--- a/neutrino-proxy-admin/src/lang/zh.js
+++ b/neutrino-proxy-admin/src/lang/zh.js
@@ -52,7 +52,9 @@ export default {
     license: 'License管理',
     portMapping: '端口映射',
     jobManager: '调度管理',
-    jobLog: '调度日志'
+    jobLog: '调度日志',
+    log: '日志管理',
+    loginLog: '登录日志'
   },
   navbar: {
     logOut: '退出登录',
diff --git a/neutrino-proxy-admin/src/router/index.js b/neutrino-proxy-admin/src/router/index.js
index fd920bdd..50d272b5 100644
--- a/neutrino-proxy-admin/src/router/index.js
+++ b/neutrino-proxy-admin/src/router/index.js
@@ -277,8 +277,21 @@ export const asyncRouterMap = [
     children: [
       { path: 'user', component: _import('system/user'), name: 'user', meta: { title: 'user' }},
       { path: 'portPool', component: _import('system/portPool'), name: 'portPool', meta: { title: 'portPool' }},
-      { path: 'jobManager', component: _import('system/jobManager'), name: 'jobManager', meta: { title: 'jobManager' }},
-      { path: 'jobLog', component: _import('system/jobLog'), name: 'jobLog', meta: { title: 'jobLog' }}
+      { path: 'jobManager', component: _import('system/jobManager'), name: 'jobManager', meta: { title: 'jobManager' }}
+    ]
+  },
+  {
+    path: '/log',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'log',
+    meta: {
+      title: 'log',
+      icon: 'component'
+    },
+    children: [
+      { path: 'jobLog', component: _import('log/jobLog'), name: 'jobLog', meta: { title: 'jobLog' }},
+      { path: 'loginLog', component: _import('log/loginLog'), name: 'loginLog', meta: { title: 'loginLog' }}
     ]
   }
 ]
diff --git a/neutrino-proxy-admin/src/views/system/jobLog.vue b/neutrino-proxy-admin/src/views/log/jobLog.vue
similarity index 100%
rename from neutrino-proxy-admin/src/views/system/jobLog.vue
rename to neutrino-proxy-admin/src/views/log/jobLog.vue
diff --git a/neutrino-proxy-admin/src/views/log/loginLog.vue b/neutrino-proxy-admin/src/views/log/loginLog.vue
new file mode 100644
index 00000000..ffffebd4
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/log/loginLog.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container calendar-list-container">
+    <div class="filter-container">
+      <el-select v-model="listQuery.jobId" placeholder="请选择" clearable>
+        <el-option v-for="item in jobList" :key="item.id" :label="item.desc" :value="item.id"/>
+      </el-select>
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>
+    </div>
+
+    <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row style="width: 100%">
+      <el-table-column type="index" width="100" :label="$t('table.id')"></el-table-column>
+      <el-table-column align="center" :label="$t('table.handler')" min-width="200">
+        <template slot-scope="scope">
+          <span>{{scope.row.handler}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.jobParam')" min-width="200">
+        <template slot-scope="scope">
+          <span>{{scope.row.param}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.jobLogCode')" min-width="120">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.code | statusFilter">{{scope.row.code | statusName}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.jobLogMsg')" min-width="400">
+        <template slot-scope="scope">
+          <span>{{scope.row.msg}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.alarmStatus')" min-width="120">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.alarmStatus | alarmStatusFilter">{{scope.row.alarmStatus | salarmStatusName}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.createTime')" min-width="150">
+        <template slot-scope="scope">
+          <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column align="center" :label="$t('table.actions')" min-width="120">
+        <template slot-scope="scope">
+          <el-button size="mini" type="primary" @click="handleShowClick(scope.row)">查看日志</el-button>
+        </template>
+      </el-table-column>-->
+    </el-table>
+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
+                     :page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { fetchList } from '@/api/jobLog'
+import { jobList } from '@/api/jobInfo'
+import waves from '@/directive/waves' // 水波纹指令
+
+export default {
+  name: 'jobLog',
+  directives: {
+    waves
+  },
+  data() {
+    return {
+      tableKey: 0,
+      list: null,
+      total: null,
+      listLoading: false,
+      listQuery: {
+        currentPage: 1,
+        pageSize: 10,
+        jobId: undefined
+      },
+      jobList: []
+    }
+  },
+  filters: {
+    statusName(status) {
+      const statusMap = {
+        0: '成功',
+        1: '失败'
+      }
+      return statusMap[status]
+    },
+    statusFilter(status) {
+      const statusMap = {
+        0: 'success',
+        1: 'danger'
+      }
+      return statusMap[status]
+    },
+    salarmStatusName(status) {
+      const statusMap = {
+        0: '-',
+        1: '待发送',
+        2: '发送成功',
+        3: '发送失败'
+      }
+      return statusMap[status]
+    },
+    alarmStatusFilter(status) {
+      const statusMap = {
+        0: 'success',
+        1: 'warning',
+        2: 'success',
+        3: 'danger'
+      }
+      return statusMap[status]
+    }
+  },
+  created() {
+    this.getList()
+    this.getJobList()
+  },
+  activated() {
+    this.getJobList()
+    if (this.$route.query.jobId) {
+      this.listQuery.jobId = this.$route.query.jobId
+      console.log(this.listQuery.jobId, this.$route.query.jobId)
+      this.getList()
+    }
+  },
+  methods: {
+    getList() {
+      this.listLoading = true
+      fetchList(this.listQuery).then(response => {
+        this.list = response.data.data.records
+        this.total = response.data.data.total
+        this.listLoading = false
+      })
+    },
+    getJobList() {
+      jobList().then(response => {
+        this.jobList = response.data.data
+      })
+    },
+    handleFilter() {
+      this.listQuery.currentPage = 1
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.listQuery.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.listQuery.currentPage = val
+      this.getList()
+    },
+    handleShowClick(row) {
+      console.log(row)
+    }
+  }
+}
+</script>
diff --git a/neutrino-proxy-admin/src/views/system/jobManager.vue b/neutrino-proxy-admin/src/views/system/jobManager.vue
index a76755ec..7370812c 100644
--- a/neutrino-proxy-admin/src/views/system/jobManager.vue
+++ b/neutrino-proxy-admin/src/views/system/jobManager.vue
@@ -225,7 +225,7 @@
         })
       },
       handleLogClick(row) {
-        this.$router.push({ path: '/system/jobLog', query: { jobId: row.id }})
+        this.$router.push({ path: '/log/jobLog', query: { jobId: row.id }})
       }
     }
   }

From 81e1efd296646642e53fc80d3857dee444e34e5c Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 20 Oct 2022 18:11:47 +0800
Subject: [PATCH 16/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97=E5=88=86=E9=A1=B5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserLoginRecordController.java | 53 ++++++++++++++
 .../req/UserLoginRecordListReq.java           | 34 +++++++++
 .../res/UserLoginRecordListRes.java           | 56 +++++++++++++++
 .../server/dal/UserLoginRecordMapper.java     |  9 +++
 .../service/UserLoginRecordService.java       | 71 +++++++++++++++++++
 5 files changed, 223 insertions(+)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserLoginRecordListRes.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java
new file mode 100644
index 00000000..4b7dcb5d
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller;
+
+import fun.asgc.neutrino.core.annotation.Autowired;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.db.page.Page;
+import fun.asgc.neutrino.core.db.page.PageQuery;
+import fun.asgc.neutrino.core.web.annotation.GetMapping;
+import fun.asgc.neutrino.core.web.annotation.RequestMapping;
+import fun.asgc.neutrino.core.web.annotation.RestController;
+import fun.asgc.neutrino.proxy.server.controller.req.UserLoginRecordListReq;
+import fun.asgc.neutrino.proxy.server.controller.res.UserLoginRecordListRes;
+import fun.asgc.neutrino.proxy.server.service.UserLoginRecordService;
+import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/20
+ */
+@NonIntercept
+@RequestMapping("user-login-record")
+@RestController
+public class UserLoginRecordController {
+    @Autowired
+    private UserLoginRecordService userLoginRecordService;
+
+    @GetMapping("page")
+    public Page<UserLoginRecordListRes> page(PageQuery pageQuery, UserLoginRecordListReq req) {
+        ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
+
+        return userLoginRecordService.page(pageQuery, req);
+    }
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java
new file mode 100644
index 00000000..82c11c7e
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserLoginRecordListReq.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+/**
+ * 用户登录日志列表请求
+ * @author: aoshiguchen
+ * @date: 2022/10/20
+ */
+@Data
+public class UserLoginRecordListReq {
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserLoginRecordListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserLoginRecordListRes.java
new file mode 100644
index 00000000..2f5ba48e
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserLoginRecordListRes.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户登录日志列表响应
+ * @author: aoshiguchen
+ * @date: 2022/10/20
+ */
+@Data
+public class UserLoginRecordListRes {
+    private Integer id;
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+    /**
+     * 用户名
+     */
+    private String userName;
+    /**
+     * ip
+     */
+    private String ip;
+    /**
+     * 类型
+     */
+    private Integer type;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java
index 61154085..90ba0c26 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java
@@ -24,7 +24,12 @@ package fun.asgc.neutrino.proxy.server.dal;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.Insert;
+import fun.asgc.neutrino.core.db.annotation.ResultType;
+import fun.asgc.neutrino.core.db.annotation.Select;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+import fun.asgc.neutrino.core.db.page.Page;
+import fun.asgc.neutrino.proxy.server.controller.req.UserLoginRecordListReq;
+import fun.asgc.neutrino.proxy.server.controller.res.UserLoginRecordListRes;
 import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO;
 
 /**
@@ -42,4 +47,8 @@ public interface UserLoginRecordMapper extends SqlMapper {
 	 */
 	@Insert("insert into `user_login_record`(`user_id`,`ip`,`token`,`type`,`create_time`) values(:userId,:ip,:token,:type,:createTime)")
 	int add(UserLoginRecordDO userLoginRecord);
+
+	@ResultType(UserLoginRecordListRes.class)
+	@Select("select * from user_login_record order by create_time desc")
+	void page(Page page, UserLoginRecordListReq req);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java
new file mode 100644
index 00000000..e1a50c8e
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.service;
+
+import fun.asgc.neutrino.core.annotation.Autowired;
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.db.page.Page;
+import fun.asgc.neutrino.core.db.page.PageQuery;
+import fun.asgc.neutrino.core.util.CollectionUtil;
+import fun.asgc.neutrino.proxy.server.controller.req.UserLoginRecordListReq;
+import fun.asgc.neutrino.proxy.server.controller.res.UserLoginRecordListRes;
+import fun.asgc.neutrino.proxy.server.dal.UserLoginRecordMapper;
+import fun.asgc.neutrino.proxy.server.dal.UserMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 用户登录日志
+ * @author: aoshiguchen
+ * @date: 2022/10/20
+ */
+@NonIntercept
+@Component
+public class UserLoginRecordService {
+    @Autowired
+    private UserLoginRecordMapper userLoginRecordMapper;
+    @Autowired
+    private UserMapper userMapper;
+
+    public Page<UserLoginRecordListRes> page(PageQuery pageQuery, UserLoginRecordListReq req) {
+        Page<UserLoginRecordListRes> page = Page.create(pageQuery);
+        userLoginRecordMapper.page(page, req);
+        if (!CollectionUtil.isEmpty(page.getRecords())) {
+            Set<Integer> userIds = page.getRecords().stream().map(UserLoginRecordListRes::getUserId).collect(Collectors.toSet());
+            List<UserDO> userList = userMapper.findByIds(userIds);
+            Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
+            for (UserLoginRecordListRes item : page.getRecords()) {
+                UserDO userDO = userMap.get(item.getUserId());
+                if (null != userDO) {
+                    item.setUserName(userDO.getName());
+                }
+            }
+        }
+        return page;
+    }
+}

From 8f46518b06d235f0f8487dcb8f1f2b95246baec0 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 21 Oct 2022 10:06:38 +0800
Subject: [PATCH 17/55] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A7=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E7=B1=BB=E5=8A=A0=E8=BD=BD=E5=99=A8=EF=BC=88?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=9B=BF=E6=8D=A2=E4=B8=BA=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/aop/proxy/AsgcProxyFactory.java      |  1 -
 .../core/aop/proxy/ProxyClassLoader.java      | 80 -------------------
 2 files changed, 81 deletions(-)
 delete mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/proxy/ProxyClassLoader.java

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/proxy/AsgcProxyFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/proxy/AsgcProxyFactory.java
index aa0acdc1..4df457f3 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/proxy/AsgcProxyFactory.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/proxy/AsgcProxyFactory.java
@@ -40,7 +40,6 @@ public class AsgcProxyFactory implements ProxyFactory {
 	private static final String classNameTemplate = "%s" + SYMBOLIC + "%s";
 	private static AtomicLong proxyClassCounter = new AtomicLong();
 	private AsgcCompiler compiler = new AsgcCompiler();
-	private ProxyClassLoader classLoader = new ProxyClassLoader();
 
 	@Override
 	public <T> T get(Class<T> targetType) throws Exception {
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/proxy/ProxyClassLoader.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/proxy/ProxyClassLoader.java
deleted file mode 100644
index 016ee66b..00000000
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/proxy/ProxyClassLoader.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package fun.asgc.neutrino.core.aop.proxy;
-
-import fun.asgc.neutrino.core.base.GlobalConfig;
-import fun.asgc.neutrino.core.util.FileUtil;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * 代理类加载器
- * @author: aoshiguchen
- * @date: 2022/6/24
- */
-public class ProxyClassLoader extends ClassLoader {
-
-	protected Map<String, byte[]> byteCodeMap = new ConcurrentHashMap<>();
-
-	static {
-		registerAsParallelCapable();
-	}
-
-	public ProxyClassLoader() {
-		super(getParentClassLoader());
-	}
-
-	protected static ClassLoader getParentClassLoader() {
-		ClassLoader ret = Thread.currentThread().getContextClassLoader();
-		return ret != null ? ret : ProxyClassLoader.class.getClassLoader();
-	}
-
-	public Class<?> loadProxyClass(ProxyClass proxyClass) {
-		if (null != proxyClass.getByteCode()) {
-			for (Map.Entry<String, byte[]> e : proxyClass.getByteCode().entrySet()) {
-				byteCodeMap.putIfAbsent(e.getKey(), e.getValue());
-			}
-		}
-
-		try {
-			return loadClass(proxyClass.getPkg() + "." + proxyClass.getName());
-		} catch (ClassNotFoundException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	@Override
-	protected Class<?> findClass(String name) throws ClassNotFoundException {
-		byte[] bytes = byteCodeMap.get(name);
-		if (null == bytes) {
-			bytes = FileUtil.readBytes( GlobalConfig.getGeneratorCodeSavePath() + name.replaceAll("\\.", "/") + ".class");
-		}
-		if (bytes != null) {
-			Class<?> ret = defineClass(name, bytes, 0, bytes.length);
-			byteCodeMap.remove(name);
-			return ret;
-		}
-
-		return super.findClass(name);
-	}
-}

From f71055b6ea95eb2dbdf28e542f838bb9d03e393a Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sat, 22 Oct 2022 16:58:03 +0800
Subject: [PATCH 18/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/api/loginLog.js      |  9 +++
 neutrino-proxy-admin/src/lang/zh.js           |  4 +-
 .../src/views/log/loginLog.vue                | 66 +++++++------------
 3 files changed, 34 insertions(+), 45 deletions(-)
 create mode 100644 neutrino-proxy-admin/src/api/loginLog.js

diff --git a/neutrino-proxy-admin/src/api/loginLog.js b/neutrino-proxy-admin/src/api/loginLog.js
new file mode 100644
index 00000000..df20fede
--- /dev/null
+++ b/neutrino-proxy-admin/src/api/loginLog.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function fetchList(query) {
+  return request({
+    url: '/user-login-record/page',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js
index 8f814ae9..fac13f8b 100644
--- a/neutrino-proxy-admin/src/lang/zh.js
+++ b/neutrino-proxy-admin/src/lang/zh.js
@@ -137,7 +137,9 @@ export default {
     alarmDing: '任务报警钉钉',
     jobLogCode: '执行结果',
     jobLogMsg: '执行日志',
-    alarmStatus: '报警状态'
+    alarmStatus: '报警状态',
+    ip: 'IP',
+    happendTime: '发生时间'
   },
   errorLog: {
     tips: '请点击右上角bug小图标',
diff --git a/neutrino-proxy-admin/src/views/log/loginLog.vue b/neutrino-proxy-admin/src/views/log/loginLog.vue
index ffffebd4..c4c9ad04 100644
--- a/neutrino-proxy-admin/src/views/log/loginLog.vue
+++ b/neutrino-proxy-admin/src/views/log/loginLog.vue
@@ -1,49 +1,31 @@
 <template>
   <div class="app-container calendar-list-container">
     <div class="filter-container">
-      <el-select v-model="listQuery.jobId" placeholder="请选择" clearable>
-        <el-option v-for="item in jobList" :key="item.id" :label="item.desc" :value="item.id"/>
-      </el-select>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>
     </div>
 
     <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row style="width: 100%">
       <el-table-column type="index" width="100" :label="$t('table.id')"></el-table-column>
-      <el-table-column align="center" :label="$t('table.handler')" min-width="200">
+      <el-table-column align="center" :label="$t('table.userName')" min-width="200">
         <template slot-scope="scope">
-          <span>{{scope.row.handler}}</span>
+          <span>{{scope.row.userName}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.jobParam')" min-width="200">
+      <el-table-column align="center" :label="$t('table.ip')" min-width="200">
         <template slot-scope="scope">
-          <span>{{scope.row.param}}</span>
+          <span>{{scope.row.ip}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.jobLogCode')" min-width="120">
+      <el-table-column align="center" :label="$t('table.type')" min-width="120">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.code | statusFilter">{{scope.row.code | statusName}}</el-tag>
+          <el-tag :type="scope.row.type | typeFilter">{{scope.row.type | typeName}}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.jobLogMsg')" min-width="400">
-        <template slot-scope="scope">
-          <span>{{scope.row.msg}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" :label="$t('table.alarmStatus')" min-width="120">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.alarmStatus | alarmStatusFilter">{{scope.row.alarmStatus | salarmStatusName}}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" :label="$t('table.createTime')" min-width="150">
+      <el-table-column align="center" :label="$t('table.happendTime')" min-width="150">
         <template slot-scope="scope">
           <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column align="center" :label="$t('table.actions')" min-width="120">
-        <template slot-scope="scope">
-          <el-button size="mini" type="primary" @click="handleShowClick(scope.row)">查看日志</el-button>
-        </template>
-      </el-table-column>-->
     </el-table>
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
@@ -54,12 +36,11 @@
 </template>
 
 <script>
-import { fetchList } from '@/api/jobLog'
-import { jobList } from '@/api/jobInfo'
+import { fetchList } from '@/api/loginLog'
 import waves from '@/directive/waves' // 水波纹指令
 
 export default {
-  name: 'jobLog',
+  name: 'loginLog',
   directives: {
     waves
   },
@@ -73,8 +54,7 @@ export default {
         currentPage: 1,
         pageSize: 10,
         jobId: undefined
-      },
-      jobList: []
+      }
     }
   },
   filters: {
@@ -92,14 +72,19 @@ export default {
       }
       return statusMap[status]
     },
-    salarmStatusName(status) {
-      const statusMap = {
-        0: '-',
-        1: '待发送',
-        2: '发送成功',
-        3: '发送失败'
+    typeName(type) {
+      const typeMap = {
+        1: '登录',
+        2: '登出'
       }
-      return statusMap[status]
+      return typeMap[type]
+    },
+    typeFilter(type) {
+      const typeMap = {
+        1: 'success',
+        2: 'danger'
+      }
+      return typeMap[type]
     },
     alarmStatusFilter(status) {
       const statusMap = {
@@ -113,10 +98,8 @@ export default {
   },
   created() {
     this.getList()
-    this.getJobList()
   },
   activated() {
-    this.getJobList()
     if (this.$route.query.jobId) {
       this.listQuery.jobId = this.$route.query.jobId
       console.log(this.listQuery.jobId, this.$route.query.jobId)
@@ -132,11 +115,6 @@ export default {
         this.listLoading = false
       })
     },
-    getJobList() {
-      jobList().then(response => {
-        this.jobList = response.data.data
-      })
-    },
     handleFilter() {
       this.listQuery.currentPage = 1
       this.getList()

From 4b8ec0b33b26f64f4568e482b3696d1017904b53 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sun, 23 Oct 2022 13:53:54 +0800
Subject: [PATCH 19/55] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/client/core/RealServerChannelHandler.java         | 4 ++--
 .../java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java | 2 +-
 .../java/fun/asgc/neutrino/proxy/core/ProxyMessage.java     | 5 ++---
 .../proxy/server/proxy/core/VisitorChannelHandler.java      | 6 +++---
 .../java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java
index da9847f6..24ef9aa4 100755
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java
@@ -49,7 +49,7 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
         } else {
             byte[] bytes = new byte[buf.readableBytes()];
             buf.readBytes(bytes);
-            String visitorId = ProxyUtil.getRealServerChannelVisitorId(realServerChannel);
+            String visitorId = ProxyUtil.getVisitorIdByRealServerChannel(realServerChannel);
             channel.writeAndFlush(ProxyMessage.buildTransferMessage(visitorId, bytes));
         }
     }
@@ -62,7 +62,7 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         Channel realServerChannel = ctx.channel();
-        String visitorId = ProxyUtil.getRealServerChannelVisitorId(realServerChannel);
+        String visitorId = ProxyUtil.getVisitorIdByRealServerChannel(realServerChannel);
         ProxyUtil.removeRealServerChannel(visitorId);
         Channel channel = realServerChannel.attr(Constants.NEXT_CHANNEL).get();
         if (channel != null) {
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java
index fe59c4af..4d3b27f3 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java
@@ -101,7 +101,7 @@ public class ProxyUtil {
 		realServerChannel.attr(Constants.VISITOR_ID).set(visitorId);
 	}
 
-	public static String getRealServerChannelVisitorId(Channel realServerChannel) {
+	public static String getVisitorIdByRealServerChannel(Channel realServerChannel) {
 		return realServerChannel.attr(Constants.VISITOR_ID).get();
 	}
 
diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java b/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java
index d17432da..7e3041fc 100644
--- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java
+++ b/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java
@@ -27,7 +27,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  *
@@ -125,9 +124,9 @@ public class ProxyMessage {
             .setInfo(info);
     }
 
-    public static ProxyMessage buildTransferMessage(String info, byte[] data) {
+    public static ProxyMessage buildTransferMessage(String visitorId, byte[] data) {
         return create().setType(TYPE_TRANSFER)
-            .setInfo(info)
+            .setInfo(visitorId)
             .setData(data);
     }
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
index 62839841..0ca26919 100755
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
@@ -63,8 +63,8 @@ public class VisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf>
         } else {
             byte[] bytes = new byte[buf.readableBytes()];
             buf.readBytes(bytes);
-            String userId = ProxyUtil.getVisitorChannelUserId(visitorChannel);
-            proxyChannel.writeAndFlush(ProxyMessage.buildTransferMessage(userId, bytes));
+            String visitorId = ProxyUtil.getVisitorIdByChannel(visitorChannel);
+            proxyChannel.writeAndFlush(ProxyMessage.buildTransferMessage(visitorId, bytes));
         }
     }
 
@@ -104,7 +104,7 @@ public class VisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf>
         } else {
 
             // 用户连接断开，从控制连接中移除
-            String userId = ProxyUtil.getVisitorChannelUserId(userChannel);
+            String userId = ProxyUtil.getVisitorIdByChannel(userChannel);
             ProxyUtil.removeVisitorChannelFromCmdChannel(cmdChannel, userId);
 
             Channel proxyChannel = userChannel.attr(Constants.NEXT_CHANNEL).get();
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java
index 738f8b76..ce1fc2b5 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java
@@ -217,12 +217,12 @@ public class ProxyUtil {
 	}
 
 	/**
-	 * 获取用户编号
+	 * 获取访问者ID
 	 *
 	 * @param visitorChannel
 	 * @return
 	 */
-	public static String getVisitorChannelUserId(Channel visitorChannel) {
+	public static String getVisitorIdByChannel(Channel visitorChannel) {
 		if (null == visitorChannel || null == getAttachInfo(visitorChannel)) {
 			return null;
 		}

From 58504d8b4918af4a583c6ddee9b6973070b48b38 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sun, 23 Oct 2022 14:43:06 +0800
Subject: [PATCH 20/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3=E8=A1=A8=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/sql/init-structure.sql | 162 +++++++++++++-----
 1 file changed, 116 insertions(+), 46 deletions(-)

diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
index e24d5c36..b5cfc59f 100644
--- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
@@ -1,3 +1,4 @@
+#############################系统管理相关表#############################
 #用户表
 CREATE TABLE IF NOT EXISTS `user` (
   `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -10,19 +11,6 @@ CREATE TABLE IF NOT EXISTS `user` (
 );
 CREATE UNIQUE INDEX IF NOT EXISTS I_login_name ON `user` (login_name ASC);
 
-#license表
-CREATE TABLE IF NOT EXISTS `license` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `name` VARCHAR(50) NOT NULL,
-  `key` VARCHAR(100) NOT NULL,
-  `user_id` INTEGER NOT NULL,
-  `is_online` INTEGER(2) NOT NULL,
-  `enable` INTEGER(2) NOT NULL,
-  `create_time` INTEGER(20) NOT NULL,
-  `update_time` INTEGER(20) NOT NULL
-);
-CREATE UNIQUE INDEX IF NOT EXISTS I_key ON `license` (`key` ASC);
-
 #用户token表
 CREATE TABLE IF NOT EXISTS `user_token` (
   `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -32,16 +20,9 @@ CREATE TABLE IF NOT EXISTS `user_token` (
   `create_time` INTEGER NOT NULL,
   `update_time` INTEGER NOT NULL
 );
-
-#用户登录记录表
-CREATE TABLE IF NOT EXISTS `user_login_record` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `user_id` INTEGER NOT NULL,
-  `ip` VARCHAR(50) NOT NULL,
-  `token` VARCHAR(100) NOT NULL,
-  `type` INTEGER(2) NOT NULL,
-  `create_time` INTEGER(20) NOT NULL
-);
+CREATE INDEX IF NOT EXISTS I_user_id ON user_token(user_id);
+CREATE INDEX IF NOT EXISTS I_token ON user_token(token);
+CREATE INDEX IF NOT EXISTS I_expiration_time ON user_token(expiration_time);
 
 #端口池
 CREATE TABLE IF NOT EXISTS `port_pool` (
@@ -53,6 +34,20 @@ CREATE TABLE IF NOT EXISTS `port_pool` (
 );
 CREATE UNIQUE INDEX IF NOT EXISTS I_port ON port_pool (port ASC);
 
+#############################代理配置相关表#############################
+#license表
+CREATE TABLE IF NOT EXISTS `license` (
+    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `name` VARCHAR(50) NOT NULL,
+    `key` VARCHAR(100) NOT NULL,
+    `user_id` INTEGER NOT NULL,
+    `is_online` INTEGER(2) NOT NULL,
+    `enable` INTEGER(2) NOT NULL,
+    `create_time` INTEGER(20) NOT NULL,
+    `update_time` INTEGER(20) NOT NULL
+    );
+CREATE UNIQUE INDEX IF NOT EXISTS I_key ON `license` (`key` ASC);
+
 #端口映射表
 CREATE TABLE IF NOT EXISTS `port_mapping` (
   `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -67,34 +62,44 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
 );
 CREATE UNIQUE INDEX IF NOT EXISTS I_server_port ON port_mapping (server_port ASC);
 
+#############################日志管理相关表#############################
+#用户登录记录表
+CREATE TABLE IF NOT EXISTS `user_login_record` (
+    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `user_id` INTEGER NOT NULL,
+    `ip` VARCHAR(50) NOT NULL,
+    `token` VARCHAR(100) NOT NULL,
+    `type` INTEGER(2) NOT NULL,
+    `create_time` INTEGER(20) NOT NULL
+    );
 #客户端链接记录表
 CREATE TABLE IF NOT EXISTS `client_connect_record` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `user_id` INTEGER NOT NULL,
-  `ip` VARCHAR(50) NOT NULL,
-  `license_id` INTEGER(20) NOT NULL,
-  `license_key` VARCHAR(100) NOT NULL,
-  `write_bytes` INTEGER(20) DEFAULT NULL,
-  `read_bytes` INTEGER(20) DEFAULT NULL,
-  `type` INTEGER(2) NOT NULL,
-  `create_time` INTEGER(20) NOT NULL
-);
+    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `user_id` INTEGER NOT NULL,
+    `ip` VARCHAR(50) NOT NULL,
+    `license_id` INTEGER(20) NOT NULL,
+    `license_key` VARCHAR(100) NOT NULL,
+    `write_bytes` INTEGER(20) DEFAULT NULL,
+    `read_bytes` INTEGER(20) DEFAULT NULL,
+    `type` INTEGER(2) NOT NULL,
+    `create_time` INTEGER(20) NOT NULL
+    );
 
 #用户连接记录表
 CREATE TABLE IF NOT EXISTS `user_connect_record` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `server_port` INTEGER NOT NULL,
-  `user_ip` VARCHAR(50) NOT NULL,
-  `client_ip` VARCHAR(50) NOT NULL,
-  `client_lan_info` VARCHAR(50) NOT NULL,
-  `user_id` INTEGER NOT NULL,
-  `license_id` INTEGER(20) NOT NULL,
-  `license_key` VARCHAR(100) NOT NULL,
-  `write_bytes` INTEGER(20) DEFAULT NULL,
-  `read_bytes` INTEGER(20) DEFAULT NULL,
-  `type` INTEGER(2) NOT NULL,
-  `create_time` INTEGER(20) NOT NULL
-);
+    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `server_port` INTEGER NOT NULL,
+    `user_ip` VARCHAR(50) NOT NULL,
+    `client_ip` VARCHAR(50) NOT NULL,
+    `client_lan_info` VARCHAR(50) NOT NULL,
+    `user_id` INTEGER NOT NULL,
+    `license_id` INTEGER(20) NOT NULL,
+    `license_key` VARCHAR(100) NOT NULL,
+    `write_bytes` INTEGER(20) DEFAULT NULL,
+    `read_bytes` INTEGER(20) DEFAULT NULL,
+    `type` INTEGER(2) NOT NULL,
+    `create_time` INTEGER(20) NOT NULL
+    );
 
 #############################调度管理相关表#############################
 #触发器信息表
@@ -125,3 +130,68 @@ CREATE TABLE IF NOT EXISTS `job_log` (
 );
 CREATE INDEX IF NOT EXISTS I_create_time ON job_log(create_time);
 CREATE INDEX IF NOT EXISTS I_code ON job_log(code);
+
+#############################报表管理相关表#############################
+#流量统计报表-分钟(保留24小时)
+CREATE TABLE IF NOT EXISTS `flow_report_minute` (
+    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `user_id` INTEGER(20) NOT NULL,
+    `license_id` INTEGER(20) NOT NULL,
+    `ip` VARCHAR(50) NOT NULL,
+    `write_bytes` INTEGER(20) NOT NULL,
+    `read_bytes` INTEGER(20) NOT NULL,
+    `date` VARCHAR(20) NOT NULL,
+    `create_time` INTEGER(20) NOT NULL
+);
+CREATE INDEX IF NOT EXISTS I_create_time ON flow_report_minute(create_time);
+CREATE INDEX IF NOT EXISTS I_date ON flow_report_minute(`date`);
+CREATE INDEX IF NOT EXISTS I_user_id ON flow_report_minute(`user_id`);
+CREATE INDEX IF NOT EXISTS I_license_id ON flow_report_minute(`license_id`);
+
+#流量统计报表-小时(保留60天)
+CREATE TABLE IF NOT EXISTS `flow_report_hour` (
+    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `user_id` INTEGER(20) NOT NULL,
+    `license_id` INTEGER(20) NOT NULL,
+    `ip` VARCHAR(50) NOT NULL,
+    `write_bytes` INTEGER(20) NOT NULL,
+    `read_bytes` INTEGER(20) NOT NULL,
+    `date` VARCHAR(20) NOT NULL,
+    `create_time` INTEGER(20) NOT NULL
+    );
+CREATE INDEX IF NOT EXISTS I_create_time ON flow_report_hour(create_time);
+CREATE INDEX IF NOT EXISTS I_date ON flow_report_hour(`date`);
+CREATE INDEX IF NOT EXISTS I_user_id ON flow_report_hour(`user_id`);
+CREATE INDEX IF NOT EXISTS I_license_id ON flow_report_hour(`license_id`);
+
+#流量统计报表-天(保留1年)
+CREATE TABLE IF NOT EXISTS `flow_report_day` (
+    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `user_id` INTEGER(20) NOT NULL,
+    `license_id` INTEGER(20) NOT NULL,
+    `ip` VARCHAR(50) NOT NULL,
+    `write_bytes` INTEGER(20) NOT NULL,
+    `read_bytes` INTEGER(20) NOT NULL,
+    `date` VARCHAR(20) NOT NULL,
+    `create_time` INTEGER(20) NOT NULL
+    );
+CREATE INDEX IF NOT EXISTS I_create_time ON flow_report_day(create_time);
+CREATE INDEX IF NOT EXISTS I_date ON flow_report_day(`date`);
+CREATE INDEX IF NOT EXISTS I_user_id ON flow_report_day(`user_id`);
+CREATE INDEX IF NOT EXISTS I_license_id ON flow_report_day(`license_id`);
+
+#流量统计报表-月(全量保留)
+CREATE TABLE IF NOT EXISTS `flow_report_month` (
+    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `user_id` INTEGER(20) NOT NULL,
+    `license_id` INTEGER(20) NOT NULL,
+    `ip` VARCHAR(50) NOT NULL,
+    `write_bytes` INTEGER(20) NOT NULL,
+    `read_bytes` INTEGER(20) NOT NULL,
+    `date` VARCHAR(20) NOT NULL,
+    `create_time` INTEGER(20) NOT NULL
+    );
+CREATE INDEX IF NOT EXISTS I_create_time ON flow_report_month(create_time);
+CREATE INDEX IF NOT EXISTS I_date ON flow_report_month(`date`);
+CREATE INDEX IF NOT EXISTS I_user_id ON flow_report_month(`user_id`);
+CREATE INDEX IF NOT EXISTS I_license_id ON flow_report_month(`license_id`);
\ No newline at end of file

From 86269174413204761fdc25bcc3c9c914e3b86875 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sun, 23 Oct 2022 14:49:03 +0800
Subject: [PATCH 21/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3=E8=A1=A8=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrino/proxy/server/ProxyServer.java    |  1 -
 .../src/main/resources/sql/init-structure.sql | 56 +++++++++----------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java
index e3e379dc..a2d578e3 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java
@@ -24,7 +24,6 @@ package fun.asgc.neutrino.proxy.server;
 
 import fun.asgc.neutrino.core.annotation.EnableJob;
 import fun.asgc.neutrino.core.annotation.NeutrinoApplication;
-import fun.asgc.neutrino.core.base.GlobalConfig;
 import fun.asgc.neutrino.core.context.NeutrinoLauncher;
 
 /**
diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
index b5cfc59f..7a19aa02 100644
--- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `create_time` INTEGER(20) NOT NULL,
   `update_time` INTEGER(20) NOT NULL
 );
-CREATE UNIQUE INDEX IF NOT EXISTS I_login_name ON `user` (login_name ASC);
+CREATE UNIQUE INDEX IF NOT EXISTS I_user_login_name ON `user` (login_name ASC);
 
 #用户token表
 CREATE TABLE IF NOT EXISTS `user_token` (
@@ -20,9 +20,9 @@ CREATE TABLE IF NOT EXISTS `user_token` (
   `create_time` INTEGER NOT NULL,
   `update_time` INTEGER NOT NULL
 );
-CREATE INDEX IF NOT EXISTS I_user_id ON user_token(user_id);
-CREATE INDEX IF NOT EXISTS I_token ON user_token(token);
-CREATE INDEX IF NOT EXISTS I_expiration_time ON user_token(expiration_time);
+CREATE INDEX IF NOT EXISTS I_user_token_user_id ON user_token(user_id);
+CREATE INDEX IF NOT EXISTS I_user_token_token ON user_token(token);
+CREATE INDEX IF NOT EXISTS I_user_token_expiration_time ON user_token(expiration_time);
 
 #端口池
 CREATE TABLE IF NOT EXISTS `port_pool` (
@@ -32,7 +32,7 @@ CREATE TABLE IF NOT EXISTS `port_pool` (
   `update_time` INTEGER(20) NOT NULL,
   `create_time` INTEGER(20) NOT NULL
 );
-CREATE UNIQUE INDEX IF NOT EXISTS I_port ON port_pool (port ASC);
+CREATE UNIQUE INDEX IF NOT EXISTS I_port_pool_port ON port_pool (port ASC);
 
 #############################代理配置相关表#############################
 #license表
@@ -46,7 +46,7 @@ CREATE TABLE IF NOT EXISTS `license` (
     `create_time` INTEGER(20) NOT NULL,
     `update_time` INTEGER(20) NOT NULL
     );
-CREATE UNIQUE INDEX IF NOT EXISTS I_key ON `license` (`key` ASC);
+CREATE UNIQUE INDEX IF NOT EXISTS I_license_key ON `license` (`key` ASC);
 
 #端口映射表
 CREATE TABLE IF NOT EXISTS `port_mapping` (
@@ -60,7 +60,7 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
   `create_time` INTEGER(20) NOT NULL,
   `update_time` INTEGER(20) NOT NULL
 );
-CREATE UNIQUE INDEX IF NOT EXISTS I_server_port ON port_mapping (server_port ASC);
+CREATE UNIQUE INDEX IF NOT EXISTS I_port_mapping_server_port ON port_mapping (server_port ASC);
 
 #############################日志管理相关表#############################
 #用户登录记录表
@@ -71,7 +71,7 @@ CREATE TABLE IF NOT EXISTS `user_login_record` (
     `token` VARCHAR(100) NOT NULL,
     `type` INTEGER(2) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
-    );
+);
 #客户端链接记录表
 CREATE TABLE IF NOT EXISTS `client_connect_record` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS `client_connect_record` (
     `read_bytes` INTEGER(20) DEFAULT NULL,
     `type` INTEGER(2) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
-    );
+);
 
 #用户连接记录表
 CREATE TABLE IF NOT EXISTS `user_connect_record` (
@@ -115,7 +115,7 @@ CREATE TABLE IF NOT EXISTS `job_info` (
   `create_time` INTEGER(20) NOT NULL,
   `update_time` INTEGER(20) NOT NULL
 );
-CREATE UNIQUE INDEX IF NOT EXISTS I_handler ON `job_info` (`handler` ASC);
+CREATE UNIQUE INDEX IF NOT EXISTS I_job_info_handler ON `job_info` (`handler` ASC);
 
 #触发器日志表
 CREATE TABLE IF NOT EXISTS `job_log` (
@@ -128,8 +128,8 @@ CREATE TABLE IF NOT EXISTS `job_log` (
   `alarm_status` INTEGER(2) NOT NULL DEFAULT '0',
   `create_time` INTEGER(20) NOT NULL
 );
-CREATE INDEX IF NOT EXISTS I_create_time ON job_log(create_time);
-CREATE INDEX IF NOT EXISTS I_code ON job_log(code);
+CREATE INDEX IF NOT EXISTS I_job_log_create_time ON job_log(create_time);
+CREATE INDEX IF NOT EXISTS I_job_log_code ON job_log(code);
 
 #############################报表管理相关表#############################
 #流量统计报表-分钟(保留24小时)
@@ -143,10 +143,10 @@ CREATE TABLE IF NOT EXISTS `flow_report_minute` (
     `date` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
 );
-CREATE INDEX IF NOT EXISTS I_create_time ON flow_report_minute(create_time);
-CREATE INDEX IF NOT EXISTS I_date ON flow_report_minute(`date`);
-CREATE INDEX IF NOT EXISTS I_user_id ON flow_report_minute(`user_id`);
-CREATE INDEX IF NOT EXISTS I_license_id ON flow_report_minute(`license_id`);
+CREATE INDEX IF NOT EXISTS I_flow_report_minute_create_time ON flow_report_minute(create_time);
+CREATE INDEX IF NOT EXISTS I_flow_report_minute_date ON flow_report_minute(`date`);
+CREATE INDEX IF NOT EXISTS I_flow_report_minute_user_id ON flow_report_minute(`user_id`);
+CREATE INDEX IF NOT EXISTS I_flow_report_minute_license_id ON flow_report_minute(`license_id`);
 
 #流量统计报表-小时(保留60天)
 CREATE TABLE IF NOT EXISTS `flow_report_hour` (
@@ -159,10 +159,10 @@ CREATE TABLE IF NOT EXISTS `flow_report_hour` (
     `date` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
     );
-CREATE INDEX IF NOT EXISTS I_create_time ON flow_report_hour(create_time);
-CREATE INDEX IF NOT EXISTS I_date ON flow_report_hour(`date`);
-CREATE INDEX IF NOT EXISTS I_user_id ON flow_report_hour(`user_id`);
-CREATE INDEX IF NOT EXISTS I_license_id ON flow_report_hour(`license_id`);
+CREATE INDEX IF NOT EXISTS I_flow_report_hour_create_time ON flow_report_hour(create_time);
+CREATE INDEX IF NOT EXISTS I_flow_report_hour_date ON flow_report_hour(`date`);
+CREATE INDEX IF NOT EXISTS I_flow_report_hour_user_id ON flow_report_hour(`user_id`);
+CREATE INDEX IF NOT EXISTS I_flow_report_hour_license_id ON flow_report_hour(`license_id`);
 
 #流量统计报表-天(保留1年)
 CREATE TABLE IF NOT EXISTS `flow_report_day` (
@@ -175,10 +175,10 @@ CREATE TABLE IF NOT EXISTS `flow_report_day` (
     `date` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
     );
-CREATE INDEX IF NOT EXISTS I_create_time ON flow_report_day(create_time);
-CREATE INDEX IF NOT EXISTS I_date ON flow_report_day(`date`);
-CREATE INDEX IF NOT EXISTS I_user_id ON flow_report_day(`user_id`);
-CREATE INDEX IF NOT EXISTS I_license_id ON flow_report_day(`license_id`);
+CREATE INDEX IF NOT EXISTS I_flow_report_day_create_time ON flow_report_day(create_time);
+CREATE INDEX IF NOT EXISTS I_flow_report_day_date ON flow_report_day(`date`);
+CREATE INDEX IF NOT EXISTS I_flow_report_day_user_id ON flow_report_day(`user_id`);
+CREATE INDEX IF NOT EXISTS I_flow_report_day_license_id ON flow_report_day(`license_id`);
 
 #流量统计报表-月(全量保留)
 CREATE TABLE IF NOT EXISTS `flow_report_month` (
@@ -191,7 +191,7 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     `date` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
     );
-CREATE INDEX IF NOT EXISTS I_create_time ON flow_report_month(create_time);
-CREATE INDEX IF NOT EXISTS I_date ON flow_report_month(`date`);
-CREATE INDEX IF NOT EXISTS I_user_id ON flow_report_month(`user_id`);
-CREATE INDEX IF NOT EXISTS I_license_id ON flow_report_month(`license_id`);
\ No newline at end of file
+CREATE INDEX IF NOT EXISTS I_flow_report_month_create_time ON flow_report_month(create_time);
+CREATE INDEX IF NOT EXISTS I_flow_report_month_date ON flow_report_month(`date`);
+CREATE INDEX IF NOT EXISTS I_flow_report_month_user_id ON flow_report_month(`user_id`);
+CREATE INDEX IF NOT EXISTS I_flow_report_month_license_id ON flow_report_month(`license_id`);
\ No newline at end of file

From bbee153491215417a3f203facb036b261f0f779a Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 24 Oct 2022 13:55:05 +0800
Subject: [PATCH 22/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/dal/DataCleanMapper.java     | 23 +++++-
 .../server/dal/FlowReportMinuteMapper.java    | 36 ++++++++++
 .../server/dal/entity/FlowReportMinuteDO.java | 72 +++++++++++++++++++
 .../proxy/server/job/DataCleanJob.java        | 21 ++++++
 .../server/job/FlowReportForMinuteJob.java    | 45 ++++++++++++
 .../src/main/resources/sql/job_info.data.sql  |  4 +-
 .../src/main/resources/sql/license.data.sql   |  2 +-
 .../main/resources/sql/port_mapping.data.sql  |  4 +-
 .../src/main/resources/sql/port_pool.data.sql | 40 +++++------
 .../src/main/resources/sql/user.data.sql      |  4 +-
 10 files changed, 222 insertions(+), 29 deletions(-)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java
index 1b77d255..dc1d588d 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java
@@ -1,3 +1,24 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
@@ -5,8 +26,6 @@ import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.Delete;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 
-import java.util.Date;
-
 /**
  * @author: aoshiguchen
  * @date: 2022/9/17
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
new file mode 100644
index 00000000..37dec097
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.dal;
+
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/24
+ */
+@Intercept(ignoreGlobal = true)
+@Component
+public interface FlowReportMinuteMapper extends SqlMapper {
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java
new file mode 100644
index 00000000..1c729a51
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.dal.entity;
+
+import fun.asgc.neutrino.core.db.annotation.Id;
+import fun.asgc.neutrino.core.db.annotation.Table;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/24
+ */
+@ToString
+@Accessors(chain = true)
+@Data
+@Table("job_info")
+public class FlowReportMinuteDO {
+    @Id
+    private Integer id;
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+    /**
+     * licenseId
+     */
+    private Integer licenseId;
+    /**
+     * ip
+     */
+    private String ip;
+    /**
+     * 写入字节数
+     */
+    private Long writeBytes;
+    /**
+     * 读取字节数
+     */
+    private Long readBytes;
+    /**
+     * 报表统计时间
+     * yyyy-MM-dd HH:mm
+     */
+    private String date;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java
index dc01a175..87ccbfed 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java
@@ -1,3 +1,24 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 package fun.asgc.neutrino.proxy.server.job;
 
 import com.alibaba.fastjson.JSONObject;
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
new file mode 100644
index 00000000..c5956bb0
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.job;
+
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.quartz.IJobHandler;
+import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 流量统计报表 - 分钟级别
+ * @author: aoshiguchen
+ * @date: 2022/10/24
+ */
+@Slf4j
+@NonIntercept
+@Component
+@JobHandler(name = "FlowReportForMinuteJob", cron = "0 */1 * * * ?", param = "")
+public class FlowReportForMinuteJob implements IJobHandler {
+
+    @Override
+    public void execute(String param) throws Exception {
+        // TODO aoshiguchen
+    }
+}
diff --git a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
index cacaf11c..72099526 100644
--- a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
@@ -1,5 +1,5 @@
 #job_qrtz_trigger_info
-insert into job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) values
+INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
 (1, '示例Job', 'DemoJob', '0/10 * * * * ?', '{"a":101}', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) values
+INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
 (2, '数据清理任务', 'DataCleanJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file
diff --git a/neutrino-proxy-server/src/main/resources/sql/license.data.sql b/neutrino-proxy-server/src/main/resources/sql/license.data.sql
index 5e22e839..b1962f32 100644
--- a/neutrino-proxy-server/src/main/resources/sql/license.data.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/license.data.sql
@@ -1,3 +1,3 @@
 #license
-insert into license(`id`, `name`, `key`, `user_id`, `is_online`, `enable`, `create_time`, `update_time`) values
+INSERT INTO license(`id`, `name`, `key`, `user_id`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
 (1, '我的mac', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 2, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
diff --git a/neutrino-proxy-server/src/main/resources/sql/port_mapping.data.sql b/neutrino-proxy-server/src/main/resources/sql/port_mapping.data.sql
index 770e65ff..50256c16 100644
--- a/neutrino-proxy-server/src/main/resources/sql/port_mapping.data.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/port_mapping.data.sql
@@ -1,5 +1,5 @@
 #port_mapping
-insert into port_mapping(`id`, `license_id`, `server_port`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
 (1, 1, 9101, '127.0.0.1', 8080, 2, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_mapping(`id`, `license_id`, `server_port`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
 (2, 1, 9102, '127.0.0.1', 3306, 2, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
diff --git a/neutrino-proxy-server/src/main/resources/sql/port_pool.data.sql b/neutrino-proxy-server/src/main/resources/sql/port_pool.data.sql
index ad030a75..7bebe281 100644
--- a/neutrino-proxy-server/src/main/resources/sql/port_pool.data.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/port_pool.data.sql
@@ -1,41 +1,41 @@
 #端口池
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (1, 9101, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (2, 9102, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (3, 9103, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (4, 9104, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (5, 9105, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (6, 9106, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (7, 9107, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (8, 9108, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (9, 9109, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (10, 9110, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (11, 9111, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (12, 9112, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (13, 9113, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (14, 9114, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (15, 9115, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (16, 9116, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (17, 9117, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (18, 9118, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (19, 9119, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) values
+INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (20, 9120, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
diff --git a/neutrino-proxy-server/src/main/resources/sql/user.data.sql b/neutrino-proxy-server/src/main/resources/sql/user.data.sql
index 1b61b852..cf5f002e 100644
--- a/neutrino-proxy-server/src/main/resources/sql/user.data.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/user.data.sql
@@ -1,5 +1,5 @@
 #用户表 6613b92b77056faeb72068f184ed4c4f
-insert into `user`(`id`, `name`,`login_name`,`login_password`,`enable`,`create_time`, `update_time`) values
+INSERT INTO `user`(`id`, `name`,`login_name`,`login_password`,`enable`,`create_time`, `update_time`) VALUES
 (1, '管理员', 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
-insert into `user`(`id`, `name`,`login_name`,`login_password`,`enable`,`create_time`, `update_time`) values
+INSERT INTO `user`(`id`, `name`,`login_name`,`login_password`,`enable`,`create_time`, `update_time`) VALUES
 (2, '游客', 'visitor', 'e10adc3949ba59abbe56e057f20f883e', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));

From 32f5e2397c571389aac03fbfc8d223eb0e02b6f0 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 24 Oct 2022 14:07:21 +0800
Subject: [PATCH 23/55] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96sql=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/sql/job_info.data.sql                  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
index 72099526..73cb7307 100644
--- a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
@@ -2,4 +2,6 @@
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
 (1, '示例Job', 'DemoJob', '0/10 * * * * ?', '{"a":101}', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(2, '数据清理任务', 'DataCleanJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file
+(2, '数据清理任务', 'DataCleanJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
+(3, '流量统计报表-分钟', 'FlowReportForMinuteJob', '0 */1 * * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file

From 7e9a4d5fad127929e500269bdf7d7a92c8904596 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Tue, 25 Oct 2022 17:47:27 +0800
Subject: [PATCH 24/55] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/proxy/handler/ProxyMessageAuthHandler.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
index ed8ec681..af38e833 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
@@ -97,7 +97,7 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license已被禁用!", licenseKey));
 			return;
 		}
-		UserDO userDO = userService.findById(licenseDO.getId());
+		UserDO userDO = userService.findById(licenseDO.getUserId());
 		if (null == userDO || EnableStatusEnum.DISABLE.getStatus().equals(userDO.getEnable())) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license无效!", licenseKey));
 			return;

From 540bedb80937987099305f6a155134a7a4da3889 Mon Sep 17 00:00:00 2001
From: westboy <jin@westboy.net>
Date: Wed, 26 Oct 2022 10:50:52 +0800
Subject: [PATCH 25/55] =?UTF-8?q?=E8=A7=A3=E5=86=B3licenseKey=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/proxy/handler/ProxyMessageConnectHandler.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java
index 6b2bc4f4..6d36f234 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java
@@ -82,7 +82,7 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 			ctx.channel().close();
 			return;
 		}
-		UserDO userDO = userService.findById(licenseDO.getId());
+		UserDO userDO = userService.findById(licenseDO.getUserId());
 		if (null == userDO || EnableStatusEnum.DISABLE.getStatus().equals(userDO.getEnable())) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildErrMessage(ExceptionEnum.CONNECT_FAILED, "当前license无效!"));
 			ctx.channel().close();

From df2ced99a0287096adffaed646fbf5c70fb2c1f7 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 26 Oct 2022 22:00:13 +0800
Subject: [PATCH 26/55] =?UTF-8?q?1=E3=80=81=E6=9C=8D=E5=8A=A1=E7=AB=AF?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84=202?=
 =?UTF-8?q?=E3=80=81=E6=B5=81=E9=87=8F=E6=8A=A5=E8=A1=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=203=E3=80=81=E5=A2=9E=E5=8A=A0=E6=B5=81?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  2 +-
 docs/Channel.MD                               |  4 +-
 .../client/core/RealServerChannelHandler.java |  6 +-
 .../neutrino/proxy/core/ProxyMessage.java     |  4 +-
 .../server/dal/FlowReportMinuteMapper.java    |  2 +
 .../proxy/server/dal/LicenseMapper.java       |  5 +-
 .../server/dal/entity/FlowReportMinuteDO.java | 10 +--
 .../server/job/FlowReportForMinuteJob.java    | 39 ++++++++-
 .../proxy/core/VisitorChannelHandler.java     | 27 ++++---
 .../domain/VisitorChannelAttachInfo.java      |  4 +
 .../handler/ProxyMessageAuthHandler.java      | 13 ++-
 .../handler/ProxyMessageConnectHandler.java   | 10 +--
 .../handler/ProxyMessageTransferHandler.java  | 14 +++-
 .../server/service/FlowReportService.java     | 79 +++++++++++++++++++
 .../neutrino/proxy/server/util/ProxyUtil.java | 25 +++---
 .../src/main/resources/sql/init-structure.sql |  4 -
 16 files changed, 191 insertions(+), 57 deletions(-)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/FlowReportService.java

diff --git a/.gitignore b/.gitignore
index 83909f75..44013869 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 *.class
 data.db*
 .neutrino-proxy.license
-.neutrino-proxy-client.json
+.neutrino-proxy-client.json*
 lib/*
 
 
diff --git a/docs/Channel.MD b/docs/Channel.MD
index b28985cc..5c31b33e 100644
--- a/docs/Channel.MD
+++ b/docs/Channel.MD
@@ -18,9 +18,9 @@
 
 ## 代理数据传输的通道(ProxyChannel)
 - 该channel负责完成内网被代理服务与代理服务端之间的数据转发任务。
-- 每个客户端维护一个`ProxyChannel`的缓存队列，需要时从该队列中取，当取不到是，直接新建一个`ProxyChannel`返回。
+- 每个客户端维护一个`ProxyChannel`的缓存队列，需要时从该队列中取，当取不到时，直接新建一个`ProxyChannel`返回。
 当一个`ProxyChannel`实例用完后，需要归还到缓存队列中(`ProxyChannel`收到`DisConnect`指令时)。
-- 当`RealServerChannel`建立完成后，就会获取一个`ProxyChannel`,并绑定对应的`RealServerChannel`,并设置`RealServerChannel`为
+- 当`RealServerChannel`建立完成后，就会获取相关联的`ProxyChannel`,并与其绑定。设置`RealServerChannel`为
 可读状态。然后通过`ProxyChannel`向服务端发送`Connect`指令。
 
 
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java
index 24ef9aa4..056a52c0 100755
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java
@@ -42,15 +42,15 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, ByteBuf buf) throws Exception {
         Channel realServerChannel = ctx.channel();
-        Channel channel = realServerChannel.attr(Constants.NEXT_CHANNEL).get();
-        if (channel == null) {
+        Channel proxyChannel = realServerChannel.attr(Constants.NEXT_CHANNEL).get();
+        if (null == proxyChannel) {
             // 代理客户端连接断开
             ctx.channel().close();
         } else {
             byte[] bytes = new byte[buf.readableBytes()];
             buf.readBytes(bytes);
             String visitorId = ProxyUtil.getVisitorIdByRealServerChannel(realServerChannel);
-            channel.writeAndFlush(ProxyMessage.buildTransferMessage(visitorId, bytes));
+            proxyChannel.writeAndFlush(ProxyMessage.buildTransferMessage(visitorId, bytes));
         }
     }
 
diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java b/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java
index 7e3041fc..d2a2338e 100644
--- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java
+++ b/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java
@@ -114,9 +114,9 @@ public class ProxyMessage {
             .setInfo(data.toJSONString());
     }
 
-    public static ProxyMessage buildConnectMessage(String info) {
+    public static ProxyMessage buildConnectMessage(String visitorId) {
         return create().setType(TYPE_CONNECT)
-            .setInfo(info);
+            .setInfo(visitorId);
     }
 
     public static ProxyMessage buildDisconnectMessage(String info) {
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
index 37dec097..35762541 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
@@ -23,7 +23,9 @@ package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.annotation.Insert;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO;
 
 /**
  * @author: aoshiguchen
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java
index 82292f0d..f24dc5b8 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java
@@ -30,7 +30,6 @@ import fun.asgc.neutrino.core.db.annotation.Select;
 import fun.asgc.neutrino.core.db.annotation.Update;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.core.db.page.Page;
-import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.proxy.server.controller.req.LicenseListReq;
 import fun.asgc.neutrino.proxy.server.controller.res.LicenseListRes;
 import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
@@ -59,6 +58,10 @@ public interface LicenseMapper extends SqlMapper {
 	@Select("select * from license where enable = 1")
 	List<LicenseListRes> list();
 
+	@ResultType(LicenseDO.class)
+	@Select("select * from license")
+	List<LicenseDO> listAll();
+
 	/**
 	 * 新增license
 	 * @param license
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java
index 1c729a51..437d3899 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java
@@ -36,7 +36,7 @@ import java.util.Date;
 @ToString
 @Accessors(chain = true)
 @Data
-@Table("job_info")
+@Table("flow_report_minute")
 public class FlowReportMinuteDO {
     @Id
     private Integer id;
@@ -48,18 +48,14 @@ public class FlowReportMinuteDO {
      * licenseId
      */
     private Integer licenseId;
-    /**
-     * ip
-     */
-    private String ip;
     /**
      * 写入字节数
      */
-    private Long writeBytes;
+    private Integer writeBytes;
     /**
      * 读取字节数
      */
-    private Long readBytes;
+    private Integer readBytes;
     /**
      * 报表统计时间
      * yyyy-MM-dd HH:mm
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
index c5956bb0..fef65ec4 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
@@ -21,12 +21,23 @@
  */
 package fun.asgc.neutrino.proxy.server.job;
 
+import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.quartz.IJobHandler;
 import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
+import fun.asgc.neutrino.core.util.CollectionUtil;
+import fun.asgc.neutrino.core.util.DateUtil;
+import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper;
+import fun.asgc.neutrino.proxy.server.dal.LicenseMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO;
+import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
+import fun.asgc.neutrino.proxy.server.service.FlowReportService;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 流量统计报表 - 分钟级别
  * @author: aoshiguchen
@@ -38,8 +49,34 @@ import lombok.extern.slf4j.Slf4j;
 @JobHandler(name = "FlowReportForMinuteJob", cron = "0 */1 * * * ?", param = "")
 public class FlowReportForMinuteJob implements IJobHandler {
 
+    @Autowired
+    private FlowReportService flowReportService;
+    @Autowired
+    private LicenseMapper licenseMapper;
+    @Autowired
+    private FlowReportMinuteMapper flowReportMinuteMapper;
+
     @Override
     public void execute(String param) throws Exception {
-        // TODO aoshiguchen
+        List<LicenseDO> list = licenseMapper.listAll();
+        if (CollectionUtil.isEmpty(list)) {
+            return;
+        }
+        Date now = new Date();
+        for (LicenseDO item : list) {
+            Integer writeBytes = flowReportService.getAndResetWriteByte(item.getId());
+            Integer readBytes = flowReportService.getAndResetReadByte(item.getId());
+            if (writeBytes == 0 && readBytes == 0) {
+                continue;
+            }
+            FlowReportMinuteDO flowReportMinuteDO = new FlowReportMinuteDO();
+            flowReportMinuteDO.setUserId(item.getUserId());
+            flowReportMinuteDO.setLicenseId(item.getId());
+            flowReportMinuteDO.setWriteBytes(writeBytes);
+            flowReportMinuteDO.setReadBytes(readBytes);
+            flowReportMinuteDO.setDate(DateUtil.format(now, "yyyy-MM-dd HH:mm"));
+            flowReportMinuteDO.setCreateTime(now);
+            // TODO insert
+        }
     }
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
index 0ca26919..de829dca 100755
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
@@ -22,8 +22,11 @@
 
 package fun.asgc.neutrino.proxy.server.proxy.core;
 
+import fun.asgc.neutrino.core.util.BeanManager;
 import fun.asgc.neutrino.proxy.core.Constants;
 import fun.asgc.neutrino.proxy.core.ProxyMessage;
+import fun.asgc.neutrino.proxy.server.proxy.domain.VisitorChannelAttachInfo;
+import fun.asgc.neutrino.proxy.server.service.FlowReportService;
 import fun.asgc.neutrino.proxy.server.util.ProxyUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
@@ -41,7 +44,7 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class VisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
-    private static AtomicLong userIdProducer = new AtomicLong(0);
+    private static AtomicLong visitorIdProducer = new AtomicLong(0);
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
@@ -65,25 +68,29 @@ public class VisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf>
             buf.readBytes(bytes);
             String visitorId = ProxyUtil.getVisitorIdByChannel(visitorChannel);
             proxyChannel.writeAndFlush(ProxyMessage.buildTransferMessage(visitorId, bytes));
+
+            // 增加流量计数
+            VisitorChannelAttachInfo visitorChannelAttachInfo = ProxyUtil.getAttachInfo(visitorChannel);
+            BeanManager.getBean(FlowReportService.class).addWriteByte(visitorChannelAttachInfo.getLicenseId(), buf.readableBytes());
         }
     }
 
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        Channel userChannel = ctx.channel();
-        InetSocketAddress sa = (InetSocketAddress) userChannel.localAddress();
+        Channel visitorChannel = ctx.channel();
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
         Channel cmdChannel = ProxyUtil.getCmdChannelByServerPort(sa.getPort());
 
         if (cmdChannel == null) {
             // 该端口还没有代理客户端
             ctx.channel().close();
         } else {
-            String userId = newUserId();
+            String visitorId = newVisitorId();
             String lanInfo = ProxyUtil.getClientLanInfoByServerPort(sa.getPort());
             // 用户连接到代理服务器时，设置用户连接不可读，等待代理后端服务器连接成功后再改变为可读状态
-            userChannel.config().setOption(ChannelOption.AUTO_READ, false);
-            ProxyUtil.addUserChannelToCmdChannel(cmdChannel, userId, userChannel);
-            cmdChannel.writeAndFlush(ProxyMessage.buildConnectMessage(userId).setData(lanInfo.getBytes()));
+            visitorChannel.config().setOption(ChannelOption.AUTO_READ, false);
+            ProxyUtil.addVisitorChannelToCmdChannel(cmdChannel, visitorId, visitorChannel);
+            cmdChannel.writeAndFlush(ProxyMessage.buildConnectMessage(visitorId).setData(lanInfo.getBytes()));
         }
 
         super.channelActive(ctx);
@@ -144,11 +151,11 @@ public class VisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf>
     }
 
     /**
-     * 为用户连接产生ID
+     * 为访问者连接产生ID
      *
      * @return
      */
-    private static String newUserId() {
-        return String.valueOf(userIdProducer.incrementAndGet());
+    private static String newVisitorId() {
+        return String.valueOf(visitorIdProducer.incrementAndGet());
     }
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/VisitorChannelAttachInfo.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/VisitorChannelAttachInfo.java
index 8cca08a0..eefa1c05 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/VisitorChannelAttachInfo.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/VisitorChannelAttachInfo.java
@@ -34,6 +34,10 @@ import lombok.experimental.Accessors;
 public class VisitorChannelAttachInfo {
 	private String visitorId;
 	private String lanInfo;
+	/**
+	 * licenseId
+	 */
+	private Integer licenseId;
 	/**
 	 * ip地址
 	 */
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
index af38e833..51de8825 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
@@ -29,19 +29,16 @@ import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.util.CollectionUtil;
 import fun.asgc.neutrino.core.util.StringUtil;
 import fun.asgc.neutrino.proxy.core.*;
-import fun.asgc.neutrino.proxy.server.constant.*;
 import fun.asgc.neutrino.proxy.server.base.proxy.ProxyConfig;
-import fun.asgc.neutrino.proxy.server.proxy.core.BytesMetricsHandler;
-import fun.asgc.neutrino.proxy.server.proxy.core.VisitorChannelHandler;
+import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
 import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
+import fun.asgc.neutrino.proxy.server.proxy.core.BytesMetricsHandler;
+import fun.asgc.neutrino.proxy.server.proxy.core.VisitorChannelHandler;
 import fun.asgc.neutrino.proxy.server.proxy.domain.CmdChannelAttachInfo;
 import fun.asgc.neutrino.proxy.server.proxy.domain.ProxyMapping;
-import fun.asgc.neutrino.proxy.server.service.LicenseService;
-import fun.asgc.neutrino.proxy.server.service.PortMappingService;
-import fun.asgc.neutrino.proxy.server.service.ProxyMutualService;
-import fun.asgc.neutrino.proxy.server.service.UserService;
+import fun.asgc.neutrino.proxy.server.service.*;
 import fun.asgc.neutrino.proxy.server.util.ProxyUtil;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
@@ -80,6 +77,8 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler {
 	private PortMappingService portMappingService;
 	@Autowired
 	private ProxyMutualService proxyMutualService;
+	@Autowired
+	private FlowReportService flowReportService;
 
 	@Override
 	public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java
index 6d36f234..3f56e8e1 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java
@@ -97,14 +97,14 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 			return;
 		}
 
-		Channel userChannel = ProxyUtil.getUserChannel(cmdChannel, visitorId);
-		if (userChannel != null) {
+		Channel visitorChannel = ProxyUtil.getVisitorChannel(cmdChannel, visitorId);
+		if (visitorChannel != null) {
 			ctx.channel().attr(Constants.VISITOR_ID).set(visitorId);
 			ctx.channel().attr(Constants.LICENSE_ID).set(licenseDO.getId());
-			ctx.channel().attr(Constants.NEXT_CHANNEL).set(userChannel);
-			userChannel.attr(Constants.NEXT_CHANNEL).set(ctx.channel());
+			ctx.channel().attr(Constants.NEXT_CHANNEL).set(visitorChannel);
+			visitorChannel.attr(Constants.NEXT_CHANNEL).set(ctx.channel());
 			// 代理客户端与后端服务器连接成功，修改用户连接为可读状态
-			userChannel.config().setOption(ChannelOption.AUTO_READ, true);
+			visitorChannel.config().setOption(ChannelOption.AUTO_READ, true);
 		}
 	}
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java
index edb176d5..367e07fd 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java
@@ -25,10 +25,14 @@ package fun.asgc.neutrino.proxy.server.proxy.handler;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Match;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.util.BeanManager;
 import fun.asgc.neutrino.proxy.core.Constants;
 import fun.asgc.neutrino.proxy.core.ProxyDataTypeEnum;
 import fun.asgc.neutrino.proxy.core.ProxyMessage;
 import fun.asgc.neutrino.proxy.core.ProxyMessageHandler;
+import fun.asgc.neutrino.proxy.server.proxy.domain.VisitorChannelAttachInfo;
+import fun.asgc.neutrino.proxy.server.service.FlowReportService;
+import fun.asgc.neutrino.proxy.server.util.ProxyUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
@@ -45,11 +49,15 @@ public class ProxyMessageTransferHandler implements ProxyMessageHandler {
 
 	@Override
 	public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
-		Channel userChannel = ctx.channel().attr(Constants.NEXT_CHANNEL).get();
-		if (null != userChannel) {
+		Channel visitorChannel = ctx.channel().attr(Constants.NEXT_CHANNEL).get();
+		if (null != visitorChannel) {
 			ByteBuf buf = ctx.alloc().buffer(proxyMessage.getData().length);
 			buf.writeBytes(proxyMessage.getData());
-			userChannel.writeAndFlush(buf);
+			visitorChannel.writeAndFlush(buf);
+
+			// 增加流量计数
+			VisitorChannelAttachInfo visitorChannelAttachInfo = ProxyUtil.getAttachInfo(visitorChannel);
+			BeanManager.getBean(FlowReportService.class).addReadByte(visitorChannelAttachInfo.getLicenseId(), buf.readableBytes());
 		}
 	}
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/FlowReportService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/FlowReportService.java
new file mode 100644
index 00000000..fdc2750a
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/FlowReportService.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.service;
+
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.util.LockUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 流量报表服务
+ * @author: aoshiguchen
+ * @date: 2022/10/26
+ */
+@Slf4j
+@NonIntercept
+@Component
+public class FlowReportService {
+    private Map<Integer/*licenseId*/, AtomicInteger/*writeByte*/> writeByteMap = new HashMap<>();
+    private Map<Integer/*licenseId*/, AtomicInteger/*readByte*/> readByteMap = new HashMap<>();
+
+    private AtomicInteger getWriteByte(Integer licenseId) {
+        return LockUtil.doubleCheckProcessForNoException(() -> !writeByteMap.containsKey(licenseId),
+            licenseId,
+            () -> {
+                writeByteMap.put(licenseId, new AtomicInteger());
+            },
+            () -> writeByteMap.get(licenseId));
+    }
+
+    private AtomicInteger getReadByte(Integer licenseId) {
+        return LockUtil.doubleCheckProcessForNoException(() -> !readByteMap.containsKey(licenseId),
+                licenseId,
+                () -> {
+                    readByteMap.put(licenseId, new AtomicInteger());
+                },
+                () -> readByteMap.get(licenseId));
+    }
+
+    public void addWriteByte(Integer licenseId, Integer writeByte) {
+        getWriteByte(licenseId).addAndGet(writeByte);
+    }
+
+    public void addReadByte(Integer licenseId, Integer readByte) {
+        getReadByte(licenseId).addAndGet(readByte);
+    }
+
+    public Integer getAndResetWriteByte(Integer licenseId) {
+        return getWriteByte(licenseId).getAndSet(0);
+    }
+
+    public Integer getAndResetReadByte(Integer licenseId) {
+        return getReadByte(licenseId).getAndSet(0);
+    }
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java
index ce1fc2b5..531f2dad 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java
@@ -171,20 +171,23 @@ public class ProxyUtil {
 	/**
 	 * 增加用户连接与代理客户端连接关系
 	 *
-	 * @param userId
-	 * @param userChannel
+	 * @param visitorId
+	 * @param visitorChannel
 	 */
-	public static void addUserChannelToCmdChannel(Channel cmdChannel, String userId, Channel userChannel) {
-		InetSocketAddress sa = (InetSocketAddress) userChannel.localAddress();
+	public static void addVisitorChannelToCmdChannel(Channel cmdChannel, String visitorId, Channel visitorChannel) {
+		InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
 		String lanInfo = getClientLanInfoByServerPort(sa.getPort());
-		setAttachInfo(userChannel, new VisitorChannelAttachInfo()
-			.setVisitorId(userId)
+		CmdChannelAttachInfo cmdChannelAttachInfo = getAttachInfo(cmdChannel);
+
+		setAttachInfo(visitorChannel, new VisitorChannelAttachInfo()
+			.setVisitorId(visitorId)
 			.setLanInfo(lanInfo)
-			.setIp(ChannelUtil.getIP(userChannel))
+			.setLicenseId(cmdChannelAttachInfo.getLicenseId())
+			.setIp(ChannelUtil.getIP(visitorChannel))
 		);
 		userChannelMapLock.writeLock().lock();
 		try {
-			((CmdChannelAttachInfo)getAttachInfo(cmdChannel)).getVisitorChannelMap().put(userId, userChannel);
+			cmdChannelAttachInfo.getVisitorChannelMap().put(visitorId, visitorChannel);
 		} finally {
 			userChannelMapLock.writeLock().unlock();
 		}
@@ -206,14 +209,14 @@ public class ProxyUtil {
 	/**
 	 * 根据代理客户端连接与用户编号获取用户连接
 	 *
-	 * @param userId
+	 * @param visitorId
 	 * @return
 	 */
-	public static Channel getUserChannel(Channel cmdChannel, String userId) {
+	public static Channel getVisitorChannel(Channel cmdChannel, String visitorId) {
 		if (null == cmdChannel || null == getAttachInfo(cmdChannel)) {
 			return null;
 		}
-		return ((CmdChannelAttachInfo)getAttachInfo(cmdChannel)).getVisitorChannelMap().get(userId);
+		return ((CmdChannelAttachInfo)getAttachInfo(cmdChannel)).getVisitorChannelMap().get(visitorId);
 	}
 
 	/**
diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
index 7a19aa02..4d855f07 100644
--- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
@@ -137,7 +137,6 @@ CREATE TABLE IF NOT EXISTS `flow_report_minute` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
-    `ip` VARCHAR(50) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
     `date` VARCHAR(20) NOT NULL,
@@ -153,7 +152,6 @@ CREATE TABLE IF NOT EXISTS `flow_report_hour` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
-    `ip` VARCHAR(50) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
     `date` VARCHAR(20) NOT NULL,
@@ -169,7 +167,6 @@ CREATE TABLE IF NOT EXISTS `flow_report_day` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
-    `ip` VARCHAR(50) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
     `date` VARCHAR(20) NOT NULL,
@@ -185,7 +182,6 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
-    `ip` VARCHAR(50) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
     `date` VARCHAR(20) NOT NULL,

From 92aa25940cb4ddef6c2ad7934f5bd6aed365a2bf Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 27 Oct 2022 21:39:08 +0800
Subject: [PATCH 27/55] =?UTF-8?q?=E5=AE=8C=E5=96=84=E3=80=90=E6=B5=81?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=20-=20=E5=88=86?=
 =?UTF-8?q?=E9=92=9F=E7=BA=A7=E5=88=AB=E3=80=91=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/dal/FlowReportMinuteMapper.java    | 14 ++++++++++++++
 .../server/job/FlowReportForMinuteJob.java    | 19 +++++++++++++++----
 .../proxy/core/BytesMetricsHandler.java       |  2 +-
 .../proxy/core/VisitorChannelHandler.java     |  2 +-
 .../handler/ProxyMessageTransferHandler.java  |  2 +-
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
index 35762541..1f02dccd 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
@@ -22,11 +22,17 @@
 package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.Param;
 import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.Insert;
+import fun.asgc.neutrino.core.db.annotation.ResultType;
+import fun.asgc.neutrino.core.db.annotation.Select;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO;
 
+import java.util.List;
+import java.util.Set;
+
 /**
  * @author: aoshiguchen
  * @date: 2022/10/24
@@ -34,5 +40,13 @@ import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO;
 @Intercept(ignoreGlobal = true)
 @Component
 public interface FlowReportMinuteMapper extends SqlMapper {
+    @Select("select * from flow_report_minute where license_id = :licenseId and date = :date")
+    FlowReportMinuteDO findOne(@Param("licenseId") Integer licenseId, @Param("date") String date);
 
+    @ResultType(FlowReportMinuteDO.class)
+    @Select("select * from flow_report_minute where license_id in (:licenseIds) and date = :date")
+    List<FlowReportMinuteDO> findList(@Param("licenseIds") Set<Integer> licenseIds, @Param("date") String date);
+
+    @Insert("insert into flow_report_minute(`user_id`,`license_id`,`write_bytes`,`read_bytes`,`date`,`create_time`) values(:userId,:licenseId,:writeBytes,:readBytes,:date,:createTime)")
+    void add(FlowReportMinuteDO flowReportMinuteDO);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
index fef65ec4..47922b35 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
@@ -35,8 +35,9 @@ import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
 import fun.asgc.neutrino.proxy.server.service.FlowReportService;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 流量统计报表 - 分钟级别
@@ -62,8 +63,18 @@ public class FlowReportForMinuteJob implements IJobHandler {
         if (CollectionUtil.isEmpty(list)) {
             return;
         }
+        Set<Integer> licenseIds = list.stream().map(LicenseDO::getId).collect(Collectors.toSet());
         Date now = new Date();
+        String date = DateUtil.format(DateUtil.addDate(now, Calendar.MINUTE, -1), "yyyy-MM-dd HH:mm");
+        List<FlowReportMinuteDO> oldList = flowReportMinuteMapper.findList(licenseIds, date);
+        Map<Integer, FlowReportMinuteDO> oldMap = CollectionUtil.isEmpty(oldList) ? new HashMap<>() :
+                oldList.stream().collect(Collectors.toMap(FlowReportMinuteDO::getLicenseId, Function.identity(), (a,b) -> a));
+
         for (LicenseDO item : list) {
+            // 避免job重复执行导致数据重复
+            if (oldMap.containsKey(item.getId())) {
+                continue;
+            }
             Integer writeBytes = flowReportService.getAndResetWriteByte(item.getId());
             Integer readBytes = flowReportService.getAndResetReadByte(item.getId());
             if (writeBytes == 0 && readBytes == 0) {
@@ -74,9 +85,9 @@ public class FlowReportForMinuteJob implements IJobHandler {
             flowReportMinuteDO.setLicenseId(item.getId());
             flowReportMinuteDO.setWriteBytes(writeBytes);
             flowReportMinuteDO.setReadBytes(readBytes);
-            flowReportMinuteDO.setDate(DateUtil.format(now, "yyyy-MM-dd HH:mm"));
+            flowReportMinuteDO.setDate(date);
             flowReportMinuteDO.setCreateTime(now);
-            // TODO insert
+            flowReportMinuteMapper.add(flowReportMinuteDO);
         }
     }
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/BytesMetricsHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/BytesMetricsHandler.java
index 4182d9ca..d157376c 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/BytesMetricsHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/BytesMetricsHandler.java
@@ -43,7 +43,7 @@ public class BytesMetricsHandler extends ChannelDuplexHandler {
         MetricsCollector metricsCollector = MetricsCollector.getCollector(sa.getPort());
         metricsCollector.incrementReadBytes(((ByteBuf) msg).readableBytes());
         metricsCollector.incrementReadMsgs(1);
-        System.out.println("字节数:" + metricsCollector.getMetrics().getReadBytes());
+//        System.out.println("字节数:" + metricsCollector.getMetrics().getReadBytes());
         ctx.fireChannelRead(msg);
     }
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
index de829dca..481f2326 100755
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java
@@ -71,7 +71,7 @@ public class VisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf>
 
             // 增加流量计数
             VisitorChannelAttachInfo visitorChannelAttachInfo = ProxyUtil.getAttachInfo(visitorChannel);
-            BeanManager.getBean(FlowReportService.class).addWriteByte(visitorChannelAttachInfo.getLicenseId(), buf.readableBytes());
+            BeanManager.getBean(FlowReportService.class).addWriteByte(visitorChannelAttachInfo.getLicenseId(), bytes.length);
         }
     }
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java
index 367e07fd..65e69554 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java
@@ -57,7 +57,7 @@ public class ProxyMessageTransferHandler implements ProxyMessageHandler {
 
 			// 增加流量计数
 			VisitorChannelAttachInfo visitorChannelAttachInfo = ProxyUtil.getAttachInfo(visitorChannel);
-			BeanManager.getBean(FlowReportService.class).addReadByte(visitorChannelAttachInfo.getLicenseId(), buf.readableBytes());
+			BeanManager.getBean(FlowReportService.class).addReadByte(visitorChannelAttachInfo.getLicenseId(), proxyMessage.getData().length);
 		}
 	}
 

From b13dbc687bcbffc69c9b397b96c9960bcecf0410 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 28 Oct 2022 22:44:43 +0800
Subject: [PATCH 28/55] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=A1=A8=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/dal/FlowReportHourMapper.java      | 44 ++++++++++++
 .../server/dal/FlowReportMinuteMapper.java    |  2 +-
 .../server/dal/entity/FlowReportHourDO.java   | 72 +++++++++++++++++++
 .../server/dal/entity/FlowReportMinuteDO.java |  6 +-
 .../server/job/FlowReportForHourJob.java      | 55 ++++++++++++++
 .../server/job/FlowReportForMinuteJob.java    |  6 +-
 .../src/main/resources/sql/init-structure.sql | 12 ++--
 7 files changed, 189 insertions(+), 8 deletions(-)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportHourDO.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java
new file mode 100644
index 00000000..fbfcfc42
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.dal;
+
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.Param;
+import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.annotation.Insert;
+import fun.asgc.neutrino.core.db.annotation.Select;
+import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/28
+ */
+@Intercept(ignoreGlobal = true)
+@Component
+public interface FlowReportHourMapper extends SqlMapper {
+    @Select("select * from flow_report_hour where license_id = :licenseId and date = :date")
+    FlowReportHourDO findOne(@Param("licenseId") Integer licenseId, @Param("date") String date);
+
+    @Insert("insert into flow_report_hour(`user_id`,`license_id`,`write_bytes`,`read_bytes`,`date`,`date_str`,`create_time`) values(:userId,:licenseId,:writeBytes,:readBytes,:date,:dateStr,:createTime)")
+    void add(FlowReportHourDO flowReportHourDO);
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
index 1f02dccd..e57a4801 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
@@ -47,6 +47,6 @@ public interface FlowReportMinuteMapper extends SqlMapper {
     @Select("select * from flow_report_minute where license_id in (:licenseIds) and date = :date")
     List<FlowReportMinuteDO> findList(@Param("licenseIds") Set<Integer> licenseIds, @Param("date") String date);
 
-    @Insert("insert into flow_report_minute(`user_id`,`license_id`,`write_bytes`,`read_bytes`,`date`,`create_time`) values(:userId,:licenseId,:writeBytes,:readBytes,:date,:createTime)")
+    @Insert("insert into flow_report_minute(`user_id`,`license_id`,`write_bytes`,`read_bytes`,`date`,`date_str`,`create_time`) values(:userId,:licenseId,:writeBytes,:readBytes,:date,:dateStr,:createTime)")
     void add(FlowReportMinuteDO flowReportMinuteDO);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportHourDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportHourDO.java
new file mode 100644
index 00000000..c3ee3057
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportHourDO.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.dal.entity;
+
+import fun.asgc.neutrino.core.db.annotation.Id;
+import fun.asgc.neutrino.core.db.annotation.Table;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/24
+ */
+@ToString
+@Accessors(chain = true)
+@Data
+@Table("flow_report_hour")
+public class FlowReportHourDO {
+    @Id
+    private Integer id;
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+    /**
+     * licenseId
+     */
+    private Integer licenseId;
+    /**
+     * 写入字节数
+     */
+    private Long writeBytes;
+    /**
+     * 读取字节数
+     */
+    private Long readBytes;
+    /**
+     * 报表统计时间
+     */
+    private Date date;
+    /**
+     * 报表统计时间
+     * yyyy-MM-dd HH
+     */
+    private String dateStr;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java
index 437d3899..139e9363 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java
@@ -56,11 +56,15 @@ public class FlowReportMinuteDO {
      * 读取字节数
      */
     private Integer readBytes;
+    /**
+     * 报表统计时间
+     */
+    private Date date;
     /**
      * 报表统计时间
      * yyyy-MM-dd HH:mm
      */
-    private String date;
+    private String dateStr;
     /**
      * 创建时间
      */
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java
new file mode 100644
index 00000000..13bbcd12
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.job;
+
+import fun.asgc.neutrino.core.annotation.Autowired;
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.quartz.IJobHandler;
+import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
+import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper;
+import fun.asgc.neutrino.proxy.server.dal.LicenseMapper;
+import fun.asgc.neutrino.proxy.server.service.FlowReportService;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/28
+ */
+@Slf4j
+@NonIntercept
+@Component
+@JobHandler(name = "FlowReportForHourJob", cron = "0 0 */1 * * ?", param = "")
+public class FlowReportForHourJob implements IJobHandler {
+    @Autowired
+    private FlowReportService flowReportService;
+    @Autowired
+    private LicenseMapper licenseMapper;
+    @Autowired
+    private FlowReportMinuteMapper flowReportMinuteMapper;
+
+    @Override
+    public void execute(String param) throws Exception {
+        // TODO
+    }
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
index 47922b35..5da9caa2 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java
@@ -65,8 +65,9 @@ public class FlowReportForMinuteJob implements IJobHandler {
         }
         Set<Integer> licenseIds = list.stream().map(LicenseDO::getId).collect(Collectors.toSet());
         Date now = new Date();
-        String date = DateUtil.format(DateUtil.addDate(now, Calendar.MINUTE, -1), "yyyy-MM-dd HH:mm");
-        List<FlowReportMinuteDO> oldList = flowReportMinuteMapper.findList(licenseIds, date);
+        String dateStr = DateUtil.format(DateUtil.addDate(now, Calendar.MINUTE, -1), "yyyy-MM-dd HH:mm");
+        Date date = DateUtil.parse(dateStr, "yyyy-MM-dd HH:mm");
+        List<FlowReportMinuteDO> oldList = flowReportMinuteMapper.findList(licenseIds, dateStr);
         Map<Integer, FlowReportMinuteDO> oldMap = CollectionUtil.isEmpty(oldList) ? new HashMap<>() :
                 oldList.stream().collect(Collectors.toMap(FlowReportMinuteDO::getLicenseId, Function.identity(), (a,b) -> a));
 
@@ -86,6 +87,7 @@ public class FlowReportForMinuteJob implements IJobHandler {
             flowReportMinuteDO.setWriteBytes(writeBytes);
             flowReportMinuteDO.setReadBytes(readBytes);
             flowReportMinuteDO.setDate(date);
+            flowReportMinuteDO.setDateStr(dateStr);
             flowReportMinuteDO.setCreateTime(now);
             flowReportMinuteMapper.add(flowReportMinuteDO);
         }
diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
index 4d855f07..97cfba85 100644
--- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
@@ -139,7 +139,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_minute` (
     `license_id` INTEGER(20) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
-    `date` VARCHAR(20) NOT NULL,
+    `date` INTEGER(20) NOT NULL,
+    `date_str` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
 );
 CREATE INDEX IF NOT EXISTS I_flow_report_minute_create_time ON flow_report_minute(create_time);
@@ -154,7 +155,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_hour` (
     `license_id` INTEGER(20) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
-    `date` VARCHAR(20) NOT NULL,
+    `date` INTEGER(20) NOT NULL,
+    `date_str` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
     );
 CREATE INDEX IF NOT EXISTS I_flow_report_hour_create_time ON flow_report_hour(create_time);
@@ -169,7 +171,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_day` (
     `license_id` INTEGER(20) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
-    `date` VARCHAR(20) NOT NULL,
+    `date` INTEGER(20) NOT NULL,
+    `date_str` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
     );
 CREATE INDEX IF NOT EXISTS I_flow_report_day_create_time ON flow_report_day(create_time);
@@ -184,7 +187,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     `license_id` INTEGER(20) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
-    `date` VARCHAR(20) NOT NULL,
+    `date` INTEGER(20) NOT NULL,
+    `date_str` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
     );
 CREATE INDEX IF NOT EXISTS I_flow_report_month_create_time ON flow_report_month(create_time);

From 41a9ded54a6e66a88ff8dd4b9654da7837fabe22 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sat, 29 Oct 2022 23:40:05 +0800
Subject: [PATCH 29/55] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=96=AD=E7=BA=BF=E9=87=8D=E8=BF=9E=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fun/asgc/neutrino/core/util/DateUtil.java |  7 ++++
 .../proxy/client/core/ProxyClientService.java | 38 +++++++++++++++++++
 .../src/main/resources/logback.xml            |  2 +-
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java
index e24da60f..82a660b1 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java
@@ -36,6 +36,13 @@ import java.util.function.Consumer;
  * @date: 2022/6/28
  */
 public class DateUtil {
+	public static final long SECOND_LONG = 1000L;
+	public static final long MINUTE_LONG = 60 * SECOND_LONG;
+	public static final long HOUR_LONG = 60 * MINUTE_LONG;
+	public static final long DAY_LONG = DAY_2_HOUR * HOUR_LONG;
+	public static final long MONTH_LONG = 30 * DAY_LONG;
+	public static final long YEAR_LONG = 365 * DAY_LONG;
+
 	private static final Cache<String, SimpleDateFormat> sdfCache = new MemoryCache<>();
 	private static SimpleDateFormat getSimpleDateFormat(String format) {
 		try {
diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
index 85c95677..aea79251 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
@@ -26,6 +26,7 @@ import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Bean;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.base.CustomThreadFactory;
 import fun.asgc.neutrino.core.context.Environment;
 import fun.asgc.neutrino.core.util.FileUtil;
 import fun.asgc.neutrino.core.util.StringUtil;
@@ -49,6 +50,9 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import java.io.InputStream;
 import java.security.KeyStore;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 客户端服务
@@ -69,6 +73,27 @@ public class ProxyClientService {
 	@Autowired
 	private Environment environment;
 	private volatile Channel channel;
+	/**
+	 * 重连间隔（秒）
+	 */
+	private static final long RECONNECT_INTERVAL_SECONDS = 5;
+	/**
+	 * 重连次数
+	 */
+	private volatile int reconnectCount = 0;
+	/**
+	 * 启用重连服务
+	 */
+	private volatile boolean reconnectServiceEnable = true;
+	/**
+	 * 重连服务执行器
+	 */
+	private static final ScheduledExecutorService reconnectExecutor = Executors.newSingleThreadScheduledExecutor(new CustomThreadFactory("ClientReconnect"));
+
+
+	public void ProxyClientService() {
+		this.reconnectExecutor.scheduleWithFixedDelay(this::reconnect, 0, RECONNECT_INTERVAL_SECONDS, TimeUnit.SECONDS);
+	}
 
 	public void start() {
 		if (StringUtil.isEmpty(proxyConfig.getLicenseKey())) {
@@ -125,6 +150,8 @@ public class ProxyClientService {
 						ProxyUtil.setCmdChannel(future.channel());
 						future.channel().writeAndFlush(ProxyMessage.buildAuthMessage(proxyConfig.getLicenseKey()));
 						log.info("连接代理服务成功. channelId:{}", future.channel().id().asLongText());
+
+						reconnectCount = 0;
 					} else {
 						log.info("连接代理服务失败!");
 						System.exit(-1);
@@ -156,6 +183,17 @@ public class ProxyClientService {
 		return null;
 	}
 
+	protected synchronized void reconnect() {
+		if (!reconnectServiceEnable) {
+			return;
+		}
+		if (channel.isActive()) {
+			return;
+		}
+		log.info("客户端重连 seq:{}", ++reconnectCount);
+		connectProxyServer();
+	}
+
 	@Bean
 	public Bootstrap bootstrap() {
 		return new Bootstrap();
diff --git a/neutrino-proxy-server/src/main/resources/logback.xml b/neutrino-proxy-server/src/main/resources/logback.xml
index a39d6bc7..1dc705e4 100644
--- a/neutrino-proxy-server/src/main/resources/logback.xml
+++ b/neutrino-proxy-server/src/main/resources/logback.xml
@@ -26,7 +26,7 @@
         </encoder>
     </appender>
 
-    <root level="INFO">
+    <root level="DEBUG">
         <appender-ref ref="console"/>
         <appender-ref ref="file"/>
     </root>

From 59f8c9c0422c00ec7ed77263f2a02cbfea18e828 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sat, 29 Oct 2022 23:40:52 +0800
Subject: [PATCH 30/55] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=96=AD=E7=BA=BF=E9=87=8D=E8=BF=9E=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/fun/asgc/neutrino/core/util/DateUtil.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java
index 82a660b1..539001c4 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java
@@ -39,9 +39,6 @@ public class DateUtil {
 	public static final long SECOND_LONG = 1000L;
 	public static final long MINUTE_LONG = 60 * SECOND_LONG;
 	public static final long HOUR_LONG = 60 * MINUTE_LONG;
-	public static final long DAY_LONG = DAY_2_HOUR * HOUR_LONG;
-	public static final long MONTH_LONG = 30 * DAY_LONG;
-	public static final long YEAR_LONG = 365 * DAY_LONG;
 
 	private static final Cache<String, SimpleDateFormat> sdfCache = new MemoryCache<>();
 	private static SimpleDateFormat getSimpleDateFormat(String format) {

From f75a1fa57b9998106b5af4cb1bae65c6949b309a Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sun, 30 Oct 2022 00:07:26 +0800
Subject: [PATCH 31/55] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=87=8D?=
 =?UTF-8?q?=E8=BF=9E=E6=9C=BA=E5=88=B6=E4=BC=98=E5=8C=96&=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=B0=83=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/client/core/ProxyClientService.java | 65 ++++++++++---------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
index aea79251..090fb277 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
@@ -22,10 +22,7 @@
 
 package fun.asgc.neutrino.proxy.client.core;
 
-import fun.asgc.neutrino.core.annotation.Autowired;
-import fun.asgc.neutrino.core.annotation.Bean;
-import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.annotation.*;
 import fun.asgc.neutrino.core.base.CustomThreadFactory;
 import fun.asgc.neutrino.core.context.Environment;
 import fun.asgc.neutrino.core.util.FileUtil;
@@ -84,32 +81,16 @@ public class ProxyClientService {
 	/**
 	 * 启用重连服务
 	 */
-	private volatile boolean reconnectServiceEnable = true;
+	private volatile boolean reconnectServiceEnable = false;
 	/**
 	 * 重连服务执行器
 	 */
 	private static final ScheduledExecutorService reconnectExecutor = Executors.newSingleThreadScheduledExecutor(new CustomThreadFactory("ClientReconnect"));
 
-
-	public void ProxyClientService() {
+	@Init
+	public void init() {
 		this.reconnectExecutor.scheduleWithFixedDelay(this::reconnect, 0, RECONNECT_INTERVAL_SECONDS, TimeUnit.SECONDS);
-	}
 
-	public void start() {
-		if (StringUtil.isEmpty(proxyConfig.getLicenseKey())) {
-			return;
-		}
-		if (null == channel || !channel.isActive()) {
-			connectProxyServer();
-		} else {
-			channel.writeAndFlush(ProxyMessage.buildAuthMessage(proxyConfig.getLicenseKey()));
-		}
-	}
-
-	/**
-	 * 连接代理服务器
-	 */
-	private void connectProxyServer() {
 		workerGroup = new NioEventLoopGroup();
 		realServerBootstrap.group(workerGroup);
 		realServerBootstrap.channel(NioSocketChannel.class);
@@ -132,13 +113,34 @@ public class ProxyClientService {
 				}
 
 				ch.pipeline().addLast(new ProxyMessageDecoder(proxyConfig.getProtocol().getMaxFrameLength(),
-					proxyConfig.getProtocol().getLengthFieldOffset(), proxyConfig.getProtocol().getLengthFieldLength(),
-					proxyConfig.getProtocol().getLengthAdjustment(), proxyConfig.getProtocol().getInitialBytesToStrip()));
+						proxyConfig.getProtocol().getLengthFieldOffset(), proxyConfig.getProtocol().getLengthFieldLength(),
+						proxyConfig.getProtocol().getLengthAdjustment(), proxyConfig.getProtocol().getInitialBytesToStrip()));
 				ch.pipeline().addLast(new ProxyMessageEncoder());
 				ch.pipeline().addLast(new IdleStateHandler(proxyConfig.getProtocol().getReadIdleTime(), proxyConfig.getProtocol().getWriteIdleTime(), proxyConfig.getProtocol().getAllIdleTimeSeconds()));
 				ch.pipeline().addLast(new ClientChannelHandler());
 			}
 		});
+	}
+
+	public void start() {
+		if (StringUtil.isEmpty(proxyConfig.getLicenseKey())) {
+			return;
+		}
+		if (null == channel || !channel.isActive()) {
+			try {
+				connectProxyServer();
+			} catch (Exception e) {
+				log.error("启动异常", e);
+			}
+		} else {
+			channel.writeAndFlush(ProxyMessage.buildAuthMessage(proxyConfig.getLicenseKey()));
+		}
+	}
+
+	/**
+	 * 连接代理服务器
+	 */
+	private void connectProxyServer() throws InterruptedException {
 		bootstrap.connect(proxyConfig.getClient().getServerIp(), proxyConfig.getClient().getServerPort())
 			.addListener(new ChannelFutureListener() {
 
@@ -151,13 +153,13 @@ public class ProxyClientService {
 						future.channel().writeAndFlush(ProxyMessage.buildAuthMessage(proxyConfig.getLicenseKey()));
 						log.info("连接代理服务成功. channelId:{}", future.channel().id().asLongText());
 
+						reconnectServiceEnable = true;
 						reconnectCount = 0;
 					} else {
 						log.info("连接代理服务失败!");
-						System.exit(-1);
 					}
 				}
-			});
+			}).sync();
 	}
 
 	private ChannelHandler createSslHandler() {
@@ -187,11 +189,16 @@ public class ProxyClientService {
 		if (!reconnectServiceEnable) {
 			return;
 		}
-		if (channel.isActive()) {
+		if (null != channel && channel.isActive()) {
 			return;
 		}
 		log.info("客户端重连 seq:{}", ++reconnectCount);
-		connectProxyServer();
+		try {
+			connectProxyServer();
+		} catch (Exception e) {
+			log.error("重连异常", e);
+		}
+		System.out.println("1");
 	}
 
 	@Bean

From 5f3cd8f60ef4ec2912dca608f53dc97a1a333292 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 31 Oct 2022 15:04:24 +0800
Subject: [PATCH 32/55] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fun/asgc/neutrino/proxy/client/core/ProxyClientService.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
index 090fb277..2b153f17 100644
--- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
+++ b/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java
@@ -198,7 +198,6 @@ public class ProxyClientService {
 		} catch (Exception e) {
 			log.error("重连异常", e);
 		}
-		System.out.println("1");
 	}
 
 	@Bean

From 4ebc53b755566776bd017177efbc78f6da4ffbf7 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 31 Oct 2022 15:16:10 +0800
Subject: [PATCH 33/55] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1-?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fun/asgc/neutrino/core/util/DateUtil.java | 24 +++++++++++++++++
 .../server/dal/FlowReportMinuteMapper.java    |  5 ++++
 .../server/job/FlowReportForHourJob.java      | 26 ++++++++++++++++++-
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java
index 539001c4..377909b5 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/DateUtil.java
@@ -288,6 +288,30 @@ public class DateUtil {
 		return calendar.getTime();
 	}
 
+	/**
+	 * 获取指定小时开始时间
+	 * @param date 日期
+	 * @return 指定小时开始时间
+	 */
+	public static Date getHourBegin(Date date) {
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(date);
+		setCalender(calendar, calendar.get(Calendar.HOUR), 0, 0, 0);
+		return calendar.getTime();
+	}
+
+	/**
+	 * 获取指定小时结束时间
+	 * @param date 日期
+	 * @return 指定小时结束时间
+	 */
+	public static Date getHourEnd(Date date) {
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(date);
+		setCalender(calendar, calendar.get(Calendar.HOUR), 59, 59, 999);
+		return calendar.getTime();
+	}
+
 	/**
 	 * 获取当天开始时间
 	 *
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
index e57a4801..fa2fe05a 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java
@@ -30,6 +30,7 @@ import fun.asgc.neutrino.core.db.annotation.Select;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
@@ -47,6 +48,10 @@ public interface FlowReportMinuteMapper extends SqlMapper {
     @Select("select * from flow_report_minute where license_id in (:licenseIds) and date = :date")
     List<FlowReportMinuteDO> findList(@Param("licenseIds") Set<Integer> licenseIds, @Param("date") String date);
 
+    @ResultType(FlowReportMinuteDO.class)
+    @Select("select * from flow_report_minute where date >= :startDate and date <= :endDate")
+    List<FlowReportMinuteDO> findListByDateRange(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
     @Insert("insert into flow_report_minute(`user_id`,`license_id`,`write_bytes`,`read_bytes`,`date`,`date_str`,`create_time`) values(:userId,:licenseId,:writeBytes,:readBytes,:date,:dateStr,:createTime)")
     void add(FlowReportMinuteDO flowReportMinuteDO);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java
index 13bbcd12..4ab08b19 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java
@@ -26,11 +26,19 @@ import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.quartz.IJobHandler;
 import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
+import fun.asgc.neutrino.core.util.CollectionUtil;
+import fun.asgc.neutrino.core.util.DateUtil;
+import fun.asgc.neutrino.proxy.server.dal.FlowReportHourMapper;
 import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper;
 import fun.asgc.neutrino.proxy.server.dal.LicenseMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO;
 import fun.asgc.neutrino.proxy.server.service.FlowReportService;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author: aoshiguchen
  * @date: 2022/10/28
@@ -46,10 +54,26 @@ public class FlowReportForHourJob implements IJobHandler {
     private LicenseMapper licenseMapper;
     @Autowired
     private FlowReportMinuteMapper flowReportMinuteMapper;
+    @Autowired
+    private FlowReportHourMapper flowReportHourMapper;
 
     @Override
     public void execute(String param) throws Exception {
-        // TODO
+        Date now = new Date();
+        String dateStr = DateUtil.format(DateUtil.addDate(now, Calendar.HOUR, -1), "yyyy-MM-dd HH");
+        Date date = DateUtil.parse(dateStr, "yyyy-MM-dd HH");
+        Date startHourDate = DateUtil.getHourBegin(date);
+        Date endHourDate = DateUtil.getHourEnd(date);
+
+        // 删除原来的记录 TODO
+
+        // 查询前一个小时的分钟级别统计数据
+        List<FlowReportMinuteDO> flowReportMinuteDOList = flowReportMinuteMapper.findListByDateRange(startHourDate, endHourDate);
+        if (CollectionUtil.isEmpty(flowReportMinuteDOList)) {
+            return;
+        }
+
+        // 汇总前一个小时的小时级别统计数据 TODO
     }
 
 }

From 8fce7d1677c44dc297718363663d8adb16ab97bf Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 31 Oct 2022 22:01:43 +0800
Subject: [PATCH 34/55] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1-?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=E6=8A=A5=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/dal/FlowReportHourMapper.java      |  4 +++
 .../server/job/FlowReportForHourJob.java      | 32 ++++++++++++++++---
 .../src/main/resources/sql/job_info.data.sql  |  4 ++-
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java
index fbfcfc42..822a2a19 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java
@@ -24,6 +24,7 @@ package fun.asgc.neutrino.proxy.server.dal;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Param;
 import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.annotation.Delete;
 import fun.asgc.neutrino.core.db.annotation.Insert;
 import fun.asgc.neutrino.core.db.annotation.Select;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
@@ -41,4 +42,7 @@ public interface FlowReportHourMapper extends SqlMapper {
 
     @Insert("insert into flow_report_hour(`user_id`,`license_id`,`write_bytes`,`read_bytes`,`date`,`date_str`,`create_time`) values(:userId,:licenseId,:writeBytes,:readBytes,:date,:dateStr,:createTime)")
     void add(FlowReportHourDO flowReportHourDO);
+
+    @Delete("delete from flow_report_hour where date_str = :dateStr")
+    void deleteByDateStr(@Param("dateStr") String dateStr);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java
index 4ab08b19..6f0d99ce 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java
@@ -31,13 +31,12 @@ import fun.asgc.neutrino.core.util.DateUtil;
 import fun.asgc.neutrino.proxy.server.dal.FlowReportHourMapper;
 import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper;
 import fun.asgc.neutrino.proxy.server.dal.LicenseMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO;
 import fun.asgc.neutrino.proxy.server.service.FlowReportService;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author: aoshiguchen
@@ -65,7 +64,8 @@ public class FlowReportForHourJob implements IJobHandler {
         Date startHourDate = DateUtil.getHourBegin(date);
         Date endHourDate = DateUtil.getHourEnd(date);
 
-        // 删除原来的记录 TODO
+        // 删除原来的记录
+        flowReportHourMapper.deleteByDateStr(dateStr);
 
         // 查询前一个小时的分钟级别统计数据
         List<FlowReportMinuteDO> flowReportMinuteDOList = flowReportMinuteMapper.findListByDateRange(startHourDate, endHourDate);
@@ -73,7 +73,29 @@ public class FlowReportForHourJob implements IJobHandler {
             return;
         }
 
-        // 汇总前一个小时的小时级别统计数据 TODO
+        // 汇总前一个小时的小时级别统计数据
+        Map<Integer, FlowReportHourDO> map = new HashMap<>();
+        for (FlowReportMinuteDO item : flowReportMinuteDOList) {
+            FlowReportHourDO report = map.get(item.getLicenseId());
+            if (null == report) {
+                report = new FlowReportHourDO();
+                map.put(item.getLicenseId(), report);
+            }
+            Long writeBytes = report.getWriteBytes() == null ? 0 : report.getWriteBytes();
+            Long readBytes = report.getReadBytes() == null ? 0 : report.getReadBytes();
+
+            report.setUserId(item.getUserId());
+            report.setLicenseId(item.getLicenseId());
+            report.setWriteBytes(writeBytes + item.getWriteBytes());
+            report.setReadBytes(readBytes + item.getReadBytes());
+            report.setDate(date);
+            report.setDateStr(dateStr);
+            report.setCreateTime(now);
+        }
+
+        for (FlowReportHourDO item : map.values()) {
+            flowReportHourMapper.add(item);
+        }
     }
 
 }
diff --git a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
index 73cb7307..10f27303 100644
--- a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
@@ -4,4 +4,6 @@ INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
 (2, '数据清理任务', 'DataCleanJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(3, '流量统计报表-分钟', 'FlowReportForMinuteJob', '0 */1 * * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file
+(3, '流量统计报表-分钟', 'FlowReportForMinuteJob', '0 */1 * * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
+(4, '流量统计报表-小时', 'FlowReportForHourJob', '0 0 */1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file

From aadee74d8e2d93fc4be51bb6aba7dd0150b1053f Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Tue, 1 Nov 2022 10:01:54 +0800
Subject: [PATCH 35/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=90=E6=B5=81?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1-=E5=A4=A9=E3=80=91=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8E=E7=AB=AF=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/dal/FlowReportDayMapper.java |  48 ++++++++
 .../server/dal/FlowReportHourMapper.java      |  13 ++-
 .../server/dal/entity/FlowReportDayDO.java    |  72 ++++++++++++
 .../proxy/server/job/FlowReportForDayJob.java | 104 ++++++++++++++++++
 .../src/main/resources/sql/init-structure.sql |   6 +-
 .../src/main/resources/sql/job_info.data.sql  |   4 +-
 6 files changed, 241 insertions(+), 6 deletions(-)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java
new file mode 100644
index 00000000..73d542b6
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.dal;
+
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.Param;
+import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.annotation.Delete;
+import fun.asgc.neutrino.core.db.annotation.Insert;
+import fun.asgc.neutrino.core.db.annotation.Select;
+import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportDayDO;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/28
+ */
+@Intercept(ignoreGlobal = true)
+@Component
+public interface FlowReportDayMapper extends SqlMapper {
+    @Select("select * from flow_report_day where license_id = :licenseId and date_str = :dateStr")
+    FlowReportDayDO findOne(@Param("licenseId") Integer licenseId, @Param("dateStr") String dateStr);
+
+    @Insert("insert into flow_report_day(`user_id`,`license_id`,`write_bytes`,`read_bytes`,`date`,`date_str`,`create_time`) values(:userId,:licenseId,:writeBytes,:readBytes,:date,:dateStr,:createTime)")
+    void add(FlowReportDayDO flowReportDayDO);
+
+    @Delete("delete from flow_report_day where date_str = :dateStr")
+    void deleteByDateStr(@Param("dateStr") String dateStr);
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java
index 822a2a19..f981e6ca 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java
@@ -26,10 +26,14 @@ import fun.asgc.neutrino.core.annotation.Param;
 import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.Delete;
 import fun.asgc.neutrino.core.db.annotation.Insert;
+import fun.asgc.neutrino.core.db.annotation.ResultType;
 import fun.asgc.neutrino.core.db.annotation.Select;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author: aoshiguchen
  * @date: 2022/10/28
@@ -37,12 +41,17 @@ import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO;
 @Intercept(ignoreGlobal = true)
 @Component
 public interface FlowReportHourMapper extends SqlMapper {
-    @Select("select * from flow_report_hour where license_id = :licenseId and date = :date")
-    FlowReportHourDO findOne(@Param("licenseId") Integer licenseId, @Param("date") String date);
+    @Select("select * from flow_report_hour where license_id = :licenseId and date_str = :dateStr")
+    FlowReportHourDO findOne(@Param("licenseId") Integer licenseId, @Param("dateStr") String dateStr);
 
     @Insert("insert into flow_report_hour(`user_id`,`license_id`,`write_bytes`,`read_bytes`,`date`,`date_str`,`create_time`) values(:userId,:licenseId,:writeBytes,:readBytes,:date,:dateStr,:createTime)")
     void add(FlowReportHourDO flowReportHourDO);
 
     @Delete("delete from flow_report_hour where date_str = :dateStr")
     void deleteByDateStr(@Param("dateStr") String dateStr);
+
+    @ResultType(FlowReportHourDO.class)
+    @Select("select * from flow_report_hour where date >= :startDate and date <= :endDate")
+    List<FlowReportHourDO> findListByDateRange(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java
new file mode 100644
index 00000000..9e6dee20
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.dal.entity;
+
+import fun.asgc.neutrino.core.db.annotation.Id;
+import fun.asgc.neutrino.core.db.annotation.Table;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/24
+ */
+@ToString
+@Accessors(chain = true)
+@Data
+@Table("flow_report_day")
+public class FlowReportDayDO {
+    @Id
+    private Integer id;
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+    /**
+     * licenseId
+     */
+    private Integer licenseId;
+    /**
+     * 写入字节数
+     */
+    private Long writeBytes;
+    /**
+     * 读取字节数
+     */
+    private Long readBytes;
+    /**
+     * 报表统计时间
+     */
+    private Date date;
+    /**
+     * 报表统计时间
+     * yyyy-MM-dd HH
+     */
+    private String dateStr;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java
new file mode 100644
index 00000000..9ca2a53e
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.job;
+
+import fun.asgc.neutrino.core.annotation.Autowired;
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.quartz.IJobHandler;
+import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
+import fun.asgc.neutrino.core.util.CollectionUtil;
+import fun.asgc.neutrino.core.util.DateUtil;
+import fun.asgc.neutrino.proxy.server.dal.FlowReportDayMapper;
+import fun.asgc.neutrino.proxy.server.dal.FlowReportHourMapper;
+import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper;
+import fun.asgc.neutrino.proxy.server.dal.LicenseMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportDayDO;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO;
+import fun.asgc.neutrino.proxy.server.service.FlowReportService;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.*;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/28
+ */
+@Slf4j
+@NonIntercept
+@Component
+@JobHandler(name = "FlowReportForDayJob", cron = "0 0 1 * * ?", param = "")
+public class FlowReportForDayJob implements IJobHandler {
+    @Autowired
+    private FlowReportService flowReportService;
+    @Autowired
+    private LicenseMapper licenseMapper;
+    @Autowired
+    private FlowReportMinuteMapper flowReportMinuteMapper;
+    @Autowired
+    private FlowReportHourMapper flowReportHourMapper;
+    @Autowired
+    private FlowReportDayMapper flowReportDayMapper;
+
+    @Override
+    public void execute(String param) throws Exception {
+        Date now = new Date();
+        String dateStr = DateUtil.format(DateUtil.addDate(now, Calendar.DATE, -1), "yyyy-MM-dd");
+        Date date = DateUtil.parse(dateStr, "yyyy-MM-dd");
+        Date startHourDate = DateUtil.getDayBegin(date);
+        Date endHourDate = DateUtil.getDayEnd(date);
+
+        // 删除原来的记录
+        flowReportDayMapper.deleteByDateStr(dateStr);
+
+        // 查询前一天的小时级别统计数据
+        List<FlowReportHourDO> flowReportHourDOList = flowReportHourMapper.findListByDateRange(startHourDate, endHourDate);
+        if (CollectionUtil.isEmpty(flowReportHourDOList)) {
+            return;
+        }
+
+        // 汇总前一个天的天级别统计数据
+        Map<Integer, FlowReportDayDO> map = new HashMap<>();
+        for (FlowReportHourDO item : flowReportHourDOList) {
+            FlowReportDayDO report = map.get(item.getLicenseId());
+            if (null == report) {
+                report = new FlowReportDayDO();
+                map.put(item.getLicenseId(), report);
+            }
+            Long writeBytes = report.getWriteBytes() == null ? 0 : report.getWriteBytes();
+            Long readBytes = report.getReadBytes() == null ? 0 : report.getReadBytes();
+
+            report.setUserId(item.getUserId());
+            report.setLicenseId(item.getLicenseId());
+            report.setWriteBytes(writeBytes + item.getWriteBytes());
+            report.setReadBytes(readBytes + item.getReadBytes());
+            report.setDate(date);
+            report.setDateStr(dateStr);
+            report.setCreateTime(now);
+        }
+
+        for (FlowReportDayDO item : map.values()) {
+            flowReportDayMapper.add(item);
+        }
+    }
+
+}
diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
index 97cfba85..ae0762c8 100644
--- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
@@ -158,7 +158,7 @@ CREATE TABLE IF NOT EXISTS `flow_report_hour` (
     `date` INTEGER(20) NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
-    );
+);
 CREATE INDEX IF NOT EXISTS I_flow_report_hour_create_time ON flow_report_hour(create_time);
 CREATE INDEX IF NOT EXISTS I_flow_report_hour_date ON flow_report_hour(`date`);
 CREATE INDEX IF NOT EXISTS I_flow_report_hour_user_id ON flow_report_hour(`user_id`);
@@ -174,7 +174,7 @@ CREATE TABLE IF NOT EXISTS `flow_report_day` (
     `date` INTEGER(20) NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
-    );
+);
 CREATE INDEX IF NOT EXISTS I_flow_report_day_create_time ON flow_report_day(create_time);
 CREATE INDEX IF NOT EXISTS I_flow_report_day_date ON flow_report_day(`date`);
 CREATE INDEX IF NOT EXISTS I_flow_report_day_user_id ON flow_report_day(`user_id`);
@@ -190,7 +190,7 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     `date` INTEGER(20) NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
-    );
+);
 CREATE INDEX IF NOT EXISTS I_flow_report_month_create_time ON flow_report_month(create_time);
 CREATE INDEX IF NOT EXISTS I_flow_report_month_date ON flow_report_month(`date`);
 CREATE INDEX IF NOT EXISTS I_flow_report_month_user_id ON flow_report_month(`user_id`);
diff --git a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
index 10f27303..67320131 100644
--- a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
@@ -6,4 +6,6 @@ INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
 (3, '流量统计报表-分钟', 'FlowReportForMinuteJob', '0 */1 * * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(4, '流量统计报表-小时', 'FlowReportForHourJob', '0 0 */1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file
+(4, '流量统计报表-小时', 'FlowReportForHourJob', '0 0 */1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
+(5, '流量统计报表-天', 'FlowReportForDayJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file

From 2f841ad7a58ae93fd7b315263b7c4917366fde97 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 2 Nov 2022 16:26:32 +0800
Subject: [PATCH 36/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=90=E6=B5=81?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1-=E6=9C=88=E3=80=91=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8E=E7=AB=AF=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/dal/FlowReportDayMapper.java |   8 ++
 .../server/dal/FlowReportMonthMapper.java     |  48 ++++++++
 .../server/dal/entity/FlowReportDayDO.java    |   2 +-
 .../server/dal/entity/FlowReportMonthDO.java  |  72 ++++++++++++
 .../server/job/FlowReportForMonthJob.java     | 103 ++++++++++++++++++
 .../src/main/resources/sql/job_info.data.sql  |   4 +-
 6 files changed, 235 insertions(+), 2 deletions(-)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMonthMapper.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMonthDO.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java
index 73d542b6..93f97587 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java
@@ -26,10 +26,14 @@ import fun.asgc.neutrino.core.annotation.Param;
 import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.Delete;
 import fun.asgc.neutrino.core.db.annotation.Insert;
+import fun.asgc.neutrino.core.db.annotation.ResultType;
 import fun.asgc.neutrino.core.db.annotation.Select;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportDayDO;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author: aoshiguchen
  * @date: 2022/10/28
@@ -45,4 +49,8 @@ public interface FlowReportDayMapper extends SqlMapper {
 
     @Delete("delete from flow_report_day where date_str = :dateStr")
     void deleteByDateStr(@Param("dateStr") String dateStr);
+
+    @ResultType(FlowReportDayDO.class)
+    @Select("select * from flow_report_day where date >= :startDate and date <= :endDate")
+    List<FlowReportDayDO> findListByDateRange(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMonthMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMonthMapper.java
new file mode 100644
index 00000000..7528b1cb
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMonthMapper.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.dal;
+
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.Param;
+import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.annotation.Delete;
+import fun.asgc.neutrino.core.db.annotation.Insert;
+import fun.asgc.neutrino.core.db.annotation.Select;
+import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMonthDO;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/28
+ */
+@Intercept(ignoreGlobal = true)
+@Component
+public interface FlowReportMonthMapper extends SqlMapper {
+    @Select("select * from flow_report_month where license_id = :licenseId and date_str = :dateStr")
+    FlowReportMonthDO findOne(@Param("licenseId") Integer licenseId, @Param("dateStr") String dateStr);
+
+    @Insert("insert into flow_report_month(`user_id`,`license_id`,`write_bytes`,`read_bytes`,`date`,`date_str`,`create_time`) values(:userId,:licenseId,:writeBytes,:readBytes,:date,:dateStr,:createTime)")
+    void add(FlowReportMonthDO flowReportMonthDO);
+
+    @Delete("delete from flow_report_month where date_str = :dateStr")
+    void deleteByDateStr(@Param("dateStr") String dateStr);
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java
index 9e6dee20..7da73929 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java
@@ -62,7 +62,7 @@ public class FlowReportDayDO {
     private Date date;
     /**
      * 报表统计时间
-     * yyyy-MM-dd HH
+     * yyyy-MM-dd
      */
     private String dateStr;
     /**
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMonthDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMonthDO.java
new file mode 100644
index 00000000..312e0dbb
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMonthDO.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.dal.entity;
+
+import fun.asgc.neutrino.core.db.annotation.Id;
+import fun.asgc.neutrino.core.db.annotation.Table;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/24
+ */
+@ToString
+@Accessors(chain = true)
+@Data
+@Table("flow_report_month")
+public class FlowReportMonthDO {
+    @Id
+    private Integer id;
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+    /**
+     * licenseId
+     */
+    private Integer licenseId;
+    /**
+     * 写入字节数
+     */
+    private Long writeBytes;
+    /**
+     * 读取字节数
+     */
+    private Long readBytes;
+    /**
+     * 报表统计时间
+     */
+    private Date date;
+    /**
+     * 报表统计时间
+     * yyyy-MM
+     */
+    private String dateStr;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java
new file mode 100644
index 00000000..0d440387
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.job;
+
+import fun.asgc.neutrino.core.annotation.Autowired;
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.quartz.IJobHandler;
+import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
+import fun.asgc.neutrino.core.util.CollectionUtil;
+import fun.asgc.neutrino.core.util.DateUtil;
+import fun.asgc.neutrino.proxy.server.dal.*;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportDayDO;
+import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMonthDO;
+import fun.asgc.neutrino.proxy.server.service.FlowReportService;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.*;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/10/28
+ */
+@Slf4j
+@NonIntercept
+@Component
+@JobHandler(name = "FlowReportForMonthJob", cron = "0 10 0 1 * ?", param = "")
+public class FlowReportForMonthJob implements IJobHandler {
+    @Autowired
+    private FlowReportService flowReportService;
+    @Autowired
+    private LicenseMapper licenseMapper;
+    @Autowired
+    private FlowReportMinuteMapper flowReportMinuteMapper;
+    @Autowired
+    private FlowReportHourMapper flowReportHourMapper;
+    @Autowired
+    private FlowReportDayMapper flowReportDayMapper;
+    @Autowired
+    private FlowReportMonthMapper flowReportHourDOList;
+
+    @Override
+    public void execute(String param) throws Exception {
+        Date now = new Date();
+        String dateStr = DateUtil.format(DateUtil.addDate(now, Calendar.MONTH, -1), "yyyy-MM");
+        Date date = DateUtil.parse(dateStr, "yyyy-MM");
+        Date startDayDate = DateUtil.getDayBegin(date);
+        Date endEndDate = DateUtil.getDayEnd(date);
+
+        // 删除原来的记录
+        flowReportDayMapper.deleteByDateStr(dateStr);
+
+        // 查询上个月的天级别统计数据
+        List<FlowReportDayDO> flowReportDayList = flowReportDayMapper.findListByDateRange(startDayDate, endEndDate);
+        if (CollectionUtil.isEmpty(flowReportDayList)) {
+            return;
+        }
+
+        // 汇总前一个天的天级别统计数据
+        Map<Integer, FlowReportMonthDO> map = new HashMap<>();
+        for (FlowReportDayDO item : flowReportDayList) {
+            FlowReportMonthDO report = map.get(item.getLicenseId());
+            if (null == report) {
+                report = new FlowReportMonthDO();
+                map.put(item.getLicenseId(), report);
+            }
+            Long writeBytes = report.getWriteBytes() == null ? 0 : report.getWriteBytes();
+            Long readBytes = report.getReadBytes() == null ? 0 : report.getReadBytes();
+
+            report.setUserId(item.getUserId());
+            report.setLicenseId(item.getLicenseId());
+            report.setWriteBytes(writeBytes + item.getWriteBytes());
+            report.setReadBytes(readBytes + item.getReadBytes());
+            report.setDate(date);
+            report.setDateStr(dateStr);
+            report.setCreateTime(now);
+        }
+
+        for (FlowReportMonthDO item : map.values()) {
+            flowReportHourDOList.add(item);
+        }
+    }
+
+}
diff --git a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
index 67320131..aad12b24 100644
--- a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
@@ -8,4 +8,6 @@ INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
 (4, '流量统计报表-小时', 'FlowReportForHourJob', '0 0 */1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(5, '流量统计报表-天', 'FlowReportForDayJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file
+(5, '流量统计报表-天', 'FlowReportForDayJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
+(6, '流量统计报表-月', 'FlowReportForMonthJob', '0 10 0 1 * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file

From a212056a46bcda7568c9fd7481c4d748e079aa5b Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 3 Nov 2022 21:06:34 +0800
Subject: [PATCH 37/55] =?UTF-8?q?=E6=96=B0=E5=A2=9ECrispDbKit=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrino/core/db/crisp/CrispDbConfig.java |  66 +++++++++++
 .../core/db/crisp/CrispDbContext.java         |  32 +++++
 .../core/db/crisp/CrispDbExecutor.java        |  86 ++++++++++++++
 .../neutrino/core/db/crisp/CrispDbKit.java    | 109 ++++++++++++++++++
 .../core/db/crisp/CrispDbOperator.java        |  74 ++++++++++++
 .../core/db/crisp/CrispDbUpdateResult.java    |  30 +++++
 .../db/crisp/DefaultDataSourceProvider.java   |  44 +++++++
 .../core/db/crisp/IDataSourceProvider.java    |  37 ++++++
 .../server/job/FlowReportForMonthJob.java     |   4 +-
 9 files changed, 480 insertions(+), 2 deletions(-)
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbConfig.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbContext.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbExecutor.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbKit.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbOperator.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbUpdateResult.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultDataSourceProvider.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/IDataSourceProvider.java

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbConfig.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbConfig.java
new file mode 100644
index 00000000..350d5576
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbConfig.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import javax.sql.DataSource;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/3
+ */
+public class CrispDbConfig {
+    /**
+     * 数据库名称
+     */
+    private String name;
+    /**
+     * 数据源提供者
+     */
+    private IDataSourceProvider dataSourceProvider;
+    /**
+     * 是否显示sql
+     */
+    private Boolean showSql;
+    /**
+     * 是否开启调试模式
+     */
+    private Boolean debugMode;
+
+    public CrispDbConfig(String name, IDataSourceProvider dataSourceProvider) {
+        this.name = name;
+        this.dataSourceProvider = dataSourceProvider;
+        this.showSql = Boolean.FALSE;
+        this.debugMode = Boolean.FALSE;
+    }
+
+    public CrispDbConfig(String name, DataSource dataSource) {
+        this(name, new DefaultDataSourceProvider(dataSource));
+    }
+
+    public CrispDbConfig(IDataSourceProvider dataSourceProvider) {
+        this("unknown", dataSourceProvider);
+    }
+
+    public CrispDbConfig(DataSource dataSource) {
+        this(new DefaultDataSourceProvider(dataSource));
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbContext.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbContext.java
new file mode 100644
index 00000000..21648b2e
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbContext.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import java.sql.Connection;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/3
+ */
+public class CrispDbContext {
+    private final ThreadLocal<Connection> connectionHolder = new ThreadLocal<>();
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbExecutor.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbExecutor.java
new file mode 100644
index 00000000..984b13f9
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbExecutor.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import javax.sql.DataSource;
+import java.util.List;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/3
+ */
+class CrispDbExecutor implements CrispDbOperator {
+    /**
+     * 配置
+     */
+    private CrispDbConfig config;
+    /**
+     * 上下文
+     */
+    private CrispDbContext context;
+
+    public CrispDbExecutor(CrispDbConfig config) {
+        this.config = config;
+        this.context = new CrispDbContext();
+    }
+
+    public CrispDbExecutor(IDataSourceProvider dataSourceProvider) {
+        this(new CrispDbConfig(dataSourceProvider));
+    }
+
+    public CrispDbExecutor(String name, IDataSourceProvider dataSourceProvider) {
+        this(new CrispDbConfig(name, dataSourceProvider));
+    }
+
+    public CrispDbExecutor(DataSource dataSource) {
+        this(new CrispDbConfig(dataSource));
+    }
+
+    public CrispDbExecutor(String name, DataSource dataSource) {
+        this(new CrispDbConfig(name, dataSource));
+    }
+
+    @Override
+    public <T> List<T> queryList(Class<T> resultType, String sql, Object... params) {
+        return null;
+    }
+
+    @Override
+    public <T> T query(Class<T> resultType, String sql, Object... params) {
+        return null;
+    }
+
+    @Override
+    public CrispDbUpdateResult update(String sql, Object... params) {
+        return null;
+    }
+
+    @Override
+    public CrispDbUpdateResult insert(String sql, Object... params) {
+        return null;
+    }
+
+    @Override
+    public CrispDbUpdateResult delete(String sql, Object... params) {
+        return null;
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbKit.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbKit.java
new file mode 100644
index 00000000..3a702ebb
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbKit.java
@@ -0,0 +1,109 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import fun.asgc.neutrino.core.util.LockUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 清爽的数据库工具
+ * @author: aoshiguchen
+ * @date: 2022/11/3
+ */
+public class CrispDbKit {
+    /**
+     * 数据源缓存
+     */
+    private static Map<String, CrispDbConfig> crispDbConfigMap = new HashMap<>();
+    /**
+     * 数据库操作实例
+     */
+    private static Map<String, CrispDbExecutor> crispDbExecutorMap = new HashMap<>();
+    /**
+     * 默认数据库的key
+     */
+    private static final String DEFAULT_KEY = "default";
+
+    /**
+     * 设置默认数据库配置
+     * @param config 数据库配置
+     */
+    public static void setConfig(CrispDbConfig config) {
+        setConfig(DEFAULT_KEY, config);
+    }
+
+    /**
+     * 设置数据库配置
+     * @param key 键
+     * @param config 数据库配置
+     */
+    public static void setConfig(String key, CrispDbConfig config) {
+        crispDbConfigMap.put(key, config);
+    }
+
+    /**
+     * 根据名称获取数据库配置
+     * @param key 键
+     * @return 数据库配置
+     */
+    private static CrispDbConfig getConfig(String key) {
+        return crispDbConfigMap.get(key);
+    }
+
+    /**
+     * 获取默认数据库操作实例
+     * @return
+     */
+    private static CrispDbExecutor getDbExecutor() {
+        return getDbExecutor(DEFAULT_KEY);
+    }
+
+    /**
+     * 获取数据库操作实例
+     * @param key 键
+     * @return 数据库操作实例
+     */
+    private static CrispDbExecutor getDbExecutor(String key) {
+        return LockUtil.doubleCheckProcessForNoException(
+            () -> !crispDbExecutorMap.containsKey(key),
+                key,
+            () -> {
+                CrispDbConfig config = getConfig(key);
+                if (null != config) {
+                    crispDbExecutorMap.put(key, new CrispDbExecutor(config));
+                }
+            },
+            () -> crispDbExecutorMap.get(crispDbExecutorMap)
+        );
+    }
+
+    /**
+     * 切换数据源
+     * @param name 数据源名称
+     * @return 数据库操作实例
+     */
+    public static CrispDbExecutor use(String name) {
+        return getDbExecutor(name);
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbOperator.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbOperator.java
new file mode 100644
index 00000000..651df9dd
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbOperator.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import java.util.List;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/3
+ */
+public interface CrispDbOperator {
+    /**
+     * 查询数据列表
+     * @param resultType 结果类型
+     * @param sql sql
+     * @param params 参数列表
+     * @return 查询结果列表
+     * @param <T>
+     */
+    <T> List<T> queryList(Class<T> resultType, String sql, Object... params);
+
+    /**
+     * 查询单条记录
+     * @param resultType 结果类型
+     * @param sql sql
+     * @param params 参数列表
+     * @return 查询结果
+     * @param <T>
+     */
+    <T> T query(Class<T> resultType, String sql, Object... params);
+
+    /**
+     * 更新
+     * @param sql sql
+     * @param params 参数列表
+     * @return 更新结果
+     */
+    CrispDbUpdateResult update(String sql, Object... params);
+
+    /**
+     * 新增
+     * @param sql sql
+     * @param params 参数列表
+     * @return 新增结果
+     */
+    CrispDbUpdateResult insert(String sql, Object... params);
+
+    /**
+     * 删除
+     * @param sql sql
+     * @param params 参数列表
+     * @return 删除结果
+     */
+    CrispDbUpdateResult delete(String sql, Object... params);
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbUpdateResult.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbUpdateResult.java
new file mode 100644
index 00000000..ea761a65
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbUpdateResult.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/3
+ */
+public class CrispDbUpdateResult {
+
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultDataSourceProvider.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultDataSourceProvider.java
new file mode 100644
index 00000000..123c75d2
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultDataSourceProvider.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import javax.sql.DataSource;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/3
+ */
+public class DefaultDataSourceProvider implements IDataSourceProvider {
+    /**
+     * 数据源
+     */
+    private DataSource dataSource;
+
+    public DefaultDataSourceProvider(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    @Override
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/IDataSourceProvider.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/IDataSourceProvider.java
new file mode 100644
index 00000000..34cf6a3f
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/IDataSourceProvider.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import javax.sql.DataSource;
+
+/**
+ * 数据源提供商
+ * @author: aoshiguchen
+ * @date: 2022/11/3
+ */
+public interface IDataSourceProvider {
+    /**
+     * 获取数据源
+     * @return
+     */
+    DataSource getDataSource();
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java
index 0d440387..e06c2478 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java
@@ -56,7 +56,7 @@ public class FlowReportForMonthJob implements IJobHandler {
     @Autowired
     private FlowReportDayMapper flowReportDayMapper;
     @Autowired
-    private FlowReportMonthMapper flowReportHourDOList;
+    private FlowReportMonthMapper flowReportMonthMapper;
 
     @Override
     public void execute(String param) throws Exception {
@@ -96,7 +96,7 @@ public class FlowReportForMonthJob implements IJobHandler {
         }
 
         for (FlowReportMonthDO item : map.values()) {
-            flowReportHourDOList.add(item);
+            flowReportMonthMapper.add(item);
         }
     }
 

From 13128e0a9e8d1dbaaca3e9838a20aaa1b34cfa3e Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 4 Nov 2022 16:19:35 +0800
Subject: [PATCH 38/55] =?UTF-8?q?CrispDbKit=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrino/core/db/crisp/BatchResult.java   |  80 ++++++
 .../neutrino/core/db/crisp/CrispDbKit.java    |  78 +-----
 .../{CrispDbConfig.java => DbConfig.java}     |  28 +-
 .../neutrino/core/db/crisp/DbContext.java     |  41 +++
 .../{CrispDbExecutor.java => DbExecutor.java} |  34 +--
 .../{CrispDbOperator.java => DbOperator.java} |   8 +-
 ...bUpdateResult.java => DbUpdateResult.java} |   2 +-
 .../db/crisp/DefaultSqlSessionFactory.java    |  85 ++++++
 .../neutrino/core/db/crisp/JdbcManager.java   | 100 +++++++
 ...ispDbContext.java => MappedStatement.java} |   8 +-
 .../neutrino/core/db/crisp/RowBounds.java     |  54 ++++
 .../core/db/crisp/SqlExecutorType.java        |  30 ++
 .../neutrino/core/db/crisp/SqlSession.java    | 259 ++++++++++++++++++
 .../core/db/crisp/SqlSessionFactory.java      |  49 ++++
 .../db/crisp/TransactionIsolationLevel.java   |  43 +++
 .../{LicenseMapper.xml => DbOperator.xml}     |   0
 16 files changed, 788 insertions(+), 111 deletions(-)
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/BatchResult.java
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{CrispDbConfig.java => DbConfig.java} (74%)
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{CrispDbExecutor.java => DbExecutor.java} (64%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{CrispDbOperator.java => DbOperator.java} (90%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{CrispDbUpdateResult.java => DbUpdateResult.java} (97%)
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/JdbcManager.java
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{CrispDbContext.java => MappedStatement.java} (88%)
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/RowBounds.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlExecutorType.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSession.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactory.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/TransactionIsolationLevel.java
 rename neutrino-proxy-server/src/main/resources/mapper/{LicenseMapper.xml => DbOperator.xml} (100%)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/BatchResult.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/BatchResult.java
new file mode 100644
index 00000000..74665b9c
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/BatchResult.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/4
+ */
+public class BatchResult {
+
+    private final MappedStatement mappedStatement;
+    private final String sql;
+    private final List<Object> parameterObjects;
+
+    private int[] updateCounts;
+
+    public BatchResult(MappedStatement mappedStatement, String sql) {
+        super();
+        this.mappedStatement = mappedStatement;
+        this.sql = sql;
+        this.parameterObjects = new ArrayList<>();
+    }
+
+    public BatchResult(MappedStatement mappedStatement, String sql, Object parameterObject) {
+        this(mappedStatement, sql);
+        addParameterObject(parameterObject);
+    }
+
+    public MappedStatement getMappedStatement() {
+        return mappedStatement;
+    }
+
+    public String getSql() {
+        return sql;
+    }
+
+    @Deprecated
+    public Object getParameterObject() {
+        return parameterObjects.get(0);
+    }
+
+    public List<Object> getParameterObjects() {
+        return parameterObjects;
+    }
+
+    public int[] getUpdateCounts() {
+        return updateCounts;
+    }
+
+    public void setUpdateCounts(int[] updateCounts) {
+        this.updateCounts = updateCounts;
+    }
+
+    public void addParameterObject(Object parameterObject) {
+        this.parameterObjects.add(parameterObject);
+    }
+
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbKit.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbKit.java
index 3a702ebb..b189ea9c 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbKit.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbKit.java
@@ -21,89 +21,13 @@
  */
 package fun.asgc.neutrino.core.db.crisp;
 
-import fun.asgc.neutrino.core.util.LockUtil;
-
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * 清爽的数据库工具
  * @author: aoshiguchen
  * @date: 2022/11/3
  */
 public class CrispDbKit {
-    /**
-     * 数据源缓存
-     */
-    private static Map<String, CrispDbConfig> crispDbConfigMap = new HashMap<>();
-    /**
-     * 数据库操作实例
-     */
-    private static Map<String, CrispDbExecutor> crispDbExecutorMap = new HashMap<>();
-    /**
-     * 默认数据库的key
-     */
-    private static final String DEFAULT_KEY = "default";
+    private static final JdbcManager manager = new JdbcManager();
 
-    /**
-     * 设置默认数据库配置
-     * @param config 数据库配置
-     */
-    public static void setConfig(CrispDbConfig config) {
-        setConfig(DEFAULT_KEY, config);
-    }
 
-    /**
-     * 设置数据库配置
-     * @param key 键
-     * @param config 数据库配置
-     */
-    public static void setConfig(String key, CrispDbConfig config) {
-        crispDbConfigMap.put(key, config);
-    }
-
-    /**
-     * 根据名称获取数据库配置
-     * @param key 键
-     * @return 数据库配置
-     */
-    private static CrispDbConfig getConfig(String key) {
-        return crispDbConfigMap.get(key);
-    }
-
-    /**
-     * 获取默认数据库操作实例
-     * @return
-     */
-    private static CrispDbExecutor getDbExecutor() {
-        return getDbExecutor(DEFAULT_KEY);
-    }
-
-    /**
-     * 获取数据库操作实例
-     * @param key 键
-     * @return 数据库操作实例
-     */
-    private static CrispDbExecutor getDbExecutor(String key) {
-        return LockUtil.doubleCheckProcessForNoException(
-            () -> !crispDbExecutorMap.containsKey(key),
-                key,
-            () -> {
-                CrispDbConfig config = getConfig(key);
-                if (null != config) {
-                    crispDbExecutorMap.put(key, new CrispDbExecutor(config));
-                }
-            },
-            () -> crispDbExecutorMap.get(crispDbExecutorMap)
-        );
-    }
-
-    /**
-     * 切换数据源
-     * @param name 数据源名称
-     * @return 数据库操作实例
-     */
-    public static CrispDbExecutor use(String name) {
-        return getDbExecutor(name);
-    }
 }
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbConfig.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java
similarity index 74%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbConfig.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java
index 350d5576..7d1529ff 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbConfig.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java
@@ -27,7 +27,7 @@ import javax.sql.DataSource;
  * @author: aoshiguchen
  * @date: 2022/11/3
  */
-public class CrispDbConfig {
+public class DbConfig {
     /**
      * 数据库名称
      */
@@ -44,23 +44,41 @@ public class CrispDbConfig {
      * 是否开启调试模式
      */
     private Boolean debugMode;
+    /**
+     * 上下文
+     */
+    private DbContext context;
+    /**
+     * 数据库执行器
+     */
+    private DbExecutor dbExecutor;
 
-    public CrispDbConfig(String name, IDataSourceProvider dataSourceProvider) {
+    public DbConfig(String name, IDataSourceProvider dataSourceProvider) {
         this.name = name;
         this.dataSourceProvider = dataSourceProvider;
         this.showSql = Boolean.FALSE;
         this.debugMode = Boolean.FALSE;
+        this.context = new DbContext(this);
+        this.dbExecutor = new DbExecutor(this);
     }
 
-    public CrispDbConfig(String name, DataSource dataSource) {
+    public DbConfig(String name, DataSource dataSource) {
         this(name, new DefaultDataSourceProvider(dataSource));
     }
 
-    public CrispDbConfig(IDataSourceProvider dataSourceProvider) {
+    public DbConfig(IDataSourceProvider dataSourceProvider) {
         this("unknown", dataSourceProvider);
     }
 
-    public CrispDbConfig(DataSource dataSource) {
+    public DbConfig(DataSource dataSource) {
         this(new DefaultDataSourceProvider(dataSource));
     }
+
+    /**
+     * 获取数据库操作实例
+     * @return 数据库操作实例
+     */
+    public DbExecutor getDbExecutor() {
+        return dbExecutor;
+    }
 }
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java
new file mode 100644
index 00000000..36c378ce
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import java.sql.Connection;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/3
+ */
+public class DbContext {
+    private DbConfig dbConfig;
+    private final ThreadLocal<Connection> connectionHolder = new ThreadLocal<>();
+
+    public DbContext(DbConfig dbConfig) {
+        this.dbConfig = dbConfig;
+    }
+    public SqlSessionFactory getSqlSessionFactory() {
+        // TODO
+        return null;
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbExecutor.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java
similarity index 64%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbExecutor.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java
index 984b13f9..11b344d4 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbExecutor.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java
@@ -28,35 +28,31 @@ import java.util.List;
  * @author: aoshiguchen
  * @date: 2022/11/3
  */
-class CrispDbExecutor implements CrispDbOperator {
+class DbExecutor implements DbOperator {
     /**
      * 配置
      */
-    private CrispDbConfig config;
-    /**
-     * 上下文
-     */
-    private CrispDbContext context;
+    private DbConfig config;
 
-    public CrispDbExecutor(CrispDbConfig config) {
+
+    public DbExecutor(DbConfig config) {
         this.config = config;
-        this.context = new CrispDbContext();
     }
 
-    public CrispDbExecutor(IDataSourceProvider dataSourceProvider) {
-        this(new CrispDbConfig(dataSourceProvider));
+    public DbExecutor(IDataSourceProvider dataSourceProvider) {
+        this(new DbConfig(dataSourceProvider));
     }
 
-    public CrispDbExecutor(String name, IDataSourceProvider dataSourceProvider) {
-        this(new CrispDbConfig(name, dataSourceProvider));
+    public DbExecutor(String name, IDataSourceProvider dataSourceProvider) {
+        this(new DbConfig(name, dataSourceProvider));
     }
 
-    public CrispDbExecutor(DataSource dataSource) {
-        this(new CrispDbConfig(dataSource));
+    public DbExecutor(DataSource dataSource) {
+        this(new DbConfig(dataSource));
     }
 
-    public CrispDbExecutor(String name, DataSource dataSource) {
-        this(new CrispDbConfig(name, dataSource));
+    public DbExecutor(String name, DataSource dataSource) {
+        this(new DbConfig(name, dataSource));
     }
 
     @Override
@@ -70,17 +66,17 @@ class CrispDbExecutor implements CrispDbOperator {
     }
 
     @Override
-    public CrispDbUpdateResult update(String sql, Object... params) {
+    public DbUpdateResult update(String sql, Object... params) {
         return null;
     }
 
     @Override
-    public CrispDbUpdateResult insert(String sql, Object... params) {
+    public DbUpdateResult insert(String sql, Object... params) {
         return null;
     }
 
     @Override
-    public CrispDbUpdateResult delete(String sql, Object... params) {
+    public DbUpdateResult delete(String sql, Object... params) {
         return null;
     }
 }
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbOperator.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java
similarity index 90%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbOperator.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java
index 651df9dd..e2775d39 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbOperator.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java
@@ -27,7 +27,7 @@ import java.util.List;
  * @author: aoshiguchen
  * @date: 2022/11/3
  */
-public interface CrispDbOperator {
+public interface DbOperator {
     /**
      * 查询数据列表
      * @param resultType 结果类型
@@ -54,7 +54,7 @@ public interface CrispDbOperator {
      * @param params 参数列表
      * @return 更新结果
      */
-    CrispDbUpdateResult update(String sql, Object... params);
+    DbUpdateResult update(String sql, Object... params);
 
     /**
      * 新增
@@ -62,7 +62,7 @@ public interface CrispDbOperator {
      * @param params 参数列表
      * @return 新增结果
      */
-    CrispDbUpdateResult insert(String sql, Object... params);
+    DbUpdateResult insert(String sql, Object... params);
 
     /**
      * 删除
@@ -70,5 +70,5 @@ public interface CrispDbOperator {
      * @param params 参数列表
      * @return 删除结果
      */
-    CrispDbUpdateResult delete(String sql, Object... params);
+    DbUpdateResult delete(String sql, Object... params);
 }
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbUpdateResult.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbUpdateResult.java
similarity index 97%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbUpdateResult.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbUpdateResult.java
index ea761a65..41d4e32e 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbUpdateResult.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbUpdateResult.java
@@ -25,6 +25,6 @@ package fun.asgc.neutrino.core.db.crisp;
  * @author: aoshiguchen
  * @date: 2022/11/3
  */
-public class CrispDbUpdateResult {
+public class DbUpdateResult {
 
 }
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java
new file mode 100644
index 00000000..e57ba3b2
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import java.sql.Connection;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/4
+ */
+public class DefaultSqlSessionFactory implements SqlSessionFactory {
+
+    @Override
+    public SqlSession openSession() {
+        // TODO
+        return null;
+    }
+
+    @Override
+    public SqlSession openSession(boolean autoCommit) {
+        // TODO
+        return null;
+    }
+
+    @Override
+    public SqlSession openSession(Connection connection) {
+        // TODO
+        return null;
+    }
+
+    @Override
+    public SqlSession openSession(TransactionIsolationLevel level) {
+        // TODO
+        return null;
+    }
+
+    @Override
+    public SqlSession openSession(SqlExecutorType execType) {
+        // TODO
+        return null;
+    }
+
+    @Override
+    public SqlSession openSession(SqlExecutorType execType, boolean autoCommit) {
+        // TODO
+        return null;
+    }
+
+    @Override
+    public SqlSession openSession(SqlExecutorType execType, TransactionIsolationLevel level) {
+        // TODO
+        return null;
+    }
+
+    @Override
+    public SqlSession openSession(SqlExecutorType execType, Connection connection) {
+        // TODO
+        return null;
+    }
+
+    @Override
+    public DbConfig getDbConfig() {
+        // TODO
+        return null;
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/JdbcManager.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/JdbcManager.java
new file mode 100644
index 00000000..c29cb768
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/JdbcManager.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/4
+ */
+public class JdbcManager {
+    /**
+     * 数据源缓存
+     */
+    private Map<String, DbConfig> dbConfigMap = new HashMap<>();
+    /**
+     * 默认数据库的key
+     */
+    private final String DEFAULT_KEY = "default";
+
+    /**
+     * 设置默认数据库配置
+     * @param config 数据库配置
+     */
+    public void setConfig(DbConfig config) {
+        setConfig(DEFAULT_KEY, config);
+    }
+
+    /**
+     * 设置数据库配置
+     * @param key 键
+     * @param config 数据库配置
+     */
+    public void setConfig(String key, DbConfig config) {
+        dbConfigMap.put(key, config);
+    }
+
+    /**
+     * 根据名称获取数据库配置
+     * @param key 键
+     * @return 数据库配置
+     */
+    public DbConfig getConfig(String key) {
+        return dbConfigMap.get(key);
+    }
+
+    /**
+     * 获取默认数据库配置
+     * @return 数据库配置
+     */
+    public DbConfig getConfig() {
+        return getConfig(DEFAULT_KEY);
+    }
+
+    /**
+     * 获取默认数据库操作实例
+     * @return
+     */
+    private DbExecutor getDbExecutor(String key) {
+        DbConfig dbConfig = getConfig(key);
+        return null == dbConfig ? null : dbConfig.getDbExecutor();
+    }
+
+    /**
+     * 切换数据源
+     * @param name 数据源名称
+     * @return 数据库操作实例
+     */
+    public DbExecutor use(String name) {
+        return getDbExecutor(name);
+    }
+
+    /**
+     * 切换为默认数据源
+     * @return 默认数据库操作实例
+     */
+    public DbExecutor useDefault() {
+        return getDbExecutor(DEFAULT_KEY);
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbContext.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/MappedStatement.java
similarity index 88%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbContext.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/MappedStatement.java
index 21648b2e..6c68cc6b 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/CrispDbContext.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/MappedStatement.java
@@ -21,12 +21,10 @@
  */
 package fun.asgc.neutrino.core.db.crisp;
 
-import java.sql.Connection;
-
 /**
  * @author: aoshiguchen
- * @date: 2022/11/3
+ * @date: 2022/11/4
  */
-public class CrispDbContext {
-    private final ThreadLocal<Connection> connectionHolder = new ThreadLocal<>();
+public class MappedStatement {
+    // TODO
 }
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/RowBounds.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/RowBounds.java
new file mode 100644
index 00000000..dddbdc58
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/RowBounds.java
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/4
+ */
+public class RowBounds {
+
+    public static final int NO_ROW_OFFSET = 0;
+    public static final int NO_ROW_LIMIT = Integer.MAX_VALUE;
+    public static final RowBounds DEFAULT = new RowBounds();
+
+    private final int offset;
+    private final int limit;
+
+    public RowBounds() {
+        this.offset = NO_ROW_OFFSET;
+        this.limit = NO_ROW_LIMIT;
+    }
+
+    public RowBounds(int offset, int limit) {
+        this.offset = offset;
+        this.limit = limit;
+    }
+
+    public int getOffset() {
+        return offset;
+    }
+
+    public int getLimit() {
+        return limit;
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlExecutorType.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlExecutorType.java
new file mode 100644
index 00000000..19fe0ae7
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlExecutorType.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/4
+ */
+public enum SqlExecutorType {
+    SIMPLE, REUSE, BATCH
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSession.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSession.java
new file mode 100644
index 00000000..94e98e08
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSession.java
@@ -0,0 +1,259 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import sun.plugin2.main.server.ResultHandler;
+
+import java.io.Closeable;
+import java.sql.Connection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/4
+ */
+public interface SqlSession extends Closeable {
+
+    /**
+     * Retrieve a single row mapped from the statement key.
+     * @param <T> the returned object type
+     * @param statement
+     * @return Mapped object
+     */
+    <T> T selectOne(String statement);
+
+    /**
+     * Retrieve a single row mapped from the statement key and parameter.
+     * @param <T> the returned object type
+     * @param statement Unique identifier matching the statement to use.
+     * @param parameter A parameter object to pass to the statement.
+     * @return Mapped object
+     */
+    <T> T selectOne(String statement, Object parameter);
+
+    /**
+     * Retrieve a list of mapped objects from the statement key and parameter.
+     * @param <E> the returned list element type
+     * @param statement Unique identifier matching the statement to use.
+     * @return List of mapped object
+     */
+    <E> List<E> selectList(String statement);
+
+    /**
+     * Retrieve a list of mapped objects from the statement key and parameter.
+     * @param <E> the returned list element type
+     * @param statement Unique identifier matching the statement to use.
+     * @param parameter A parameter object to pass to the statement.
+     * @return List of mapped object
+     */
+    <E> List<E> selectList(String statement, Object parameter);
+
+    /**
+     * Retrieve a list of mapped objects from the statement key and parameter,
+     * within the specified row bounds.
+     * @param <E> the returned list element type
+     * @param statement Unique identifier matching the statement to use.
+     * @param parameter A parameter object to pass to the statement.
+     * @param rowBounds  Bounds to limit object retrieval
+     * @return List of mapped object
+     */
+    <E> List<E> selectList(String statement, Object parameter, RowBounds rowBounds);
+
+    /**
+     * The selectMap is a special case in that it is designed to convert a list
+     * of results into a Map based on one of the properties in the resulting
+     * objects.
+     * Eg. Return a of Map[Integer,Author] for selectMap("selectAuthors","id")
+     * @param <K> the returned Map keys type
+     * @param <V> the returned Map values type
+     * @param statement Unique identifier matching the statement to use.
+     * @param mapKey The property to use as key for each value in the list.
+     * @return Map containing key pair data.
+     */
+    <K, V> Map<K, V> selectMap(String statement, String mapKey);
+
+    /**
+     * The selectMap is a special case in that it is designed to convert a list
+     * of results into a Map based on one of the properties in the resulting
+     * objects.
+     * @param <K> the returned Map keys type
+     * @param <V> the returned Map values type
+     * @param statement Unique identifier matching the statement to use.
+     * @param parameter A parameter object to pass to the statement.
+     * @param mapKey The property to use as key for each value in the list.
+     * @return Map containing key pair data.
+     */
+    <K, V> Map<K, V> selectMap(String statement, Object parameter, String mapKey);
+
+    /**
+     * The selectMap is a special case in that it is designed to convert a list
+     * of results into a Map based on one of the properties in the resulting
+     * objects.
+     * @param <K> the returned Map keys type
+     * @param <V> the returned Map values type
+     * @param statement Unique identifier matching the statement to use.
+     * @param parameter A parameter object to pass to the statement.
+     * @param mapKey The property to use as key for each value in the list.
+     * @param rowBounds  Bounds to limit object retrieval
+     * @return Map containing key pair data.
+     */
+    <K, V> Map<K, V> selectMap(String statement, Object parameter, String mapKey, RowBounds rowBounds);
+
+    /**
+     * Retrieve a single row mapped from the statement key and parameter
+     * using a {@code ResultHandler}.
+     * @param statement Unique identifier matching the statement to use.
+     * @param parameter A parameter object to pass to the statement.
+     * @param handler ResultHandler that will handle each retrieved row
+     */
+    void select(String statement, Object parameter, ResultHandler handler);
+
+    /**
+     * Retrieve a single row mapped from the statement
+     * using a {@code ResultHandler}.
+     * @param statement Unique identifier matching the statement to use.
+     * @param handler ResultHandler that will handle each retrieved row
+     */
+    void select(String statement, ResultHandler handler);
+
+    /**
+     * Retrieve a single row mapped from the statement key and parameter
+     * using a {@code ResultHandler} and {@code RowBounds}.
+     * @param statement Unique identifier matching the statement to use.
+     * @param rowBounds RowBound instance to limit the query results
+     * @param handler ResultHandler that will handle each retrieved row
+     */
+    void select(String statement, Object parameter, RowBounds rowBounds, ResultHandler handler);
+
+    /**
+     * Execute an insert statement.
+     * @param statement Unique identifier matching the statement to execute.
+     * @return int The number of rows affected by the insert.
+     */
+    int insert(String statement);
+
+    /**
+     * Execute an insert statement with the given parameter object. Any generated
+     * autoincrement values or selectKey entries will modify the given parameter
+     * object properties. Only the number of rows affected will be returned.
+     * @param statement Unique identifier matching the statement to execute.
+     * @param parameter A parameter object to pass to the statement.
+     * @return int The number of rows affected by the insert.
+     */
+    int insert(String statement, Object parameter);
+
+    /**
+     * Execute an update statement. The number of rows affected will be returned.
+     * @param statement Unique identifier matching the statement to execute.
+     * @return int The number of rows affected by the update.
+     */
+    int update(String statement);
+
+    /**
+     * Execute an update statement. The number of rows affected will be returned.
+     * @param statement Unique identifier matching the statement to execute.
+     * @param parameter A parameter object to pass to the statement.
+     * @return int The number of rows affected by the update.
+     */
+    int update(String statement, Object parameter);
+
+    /**
+     * Execute a delete statement. The number of rows affected will be returned.
+     * @param statement Unique identifier matching the statement to execute.
+     * @return int The number of rows affected by the delete.
+     */
+    int delete(String statement);
+
+    /**
+     * Execute a delete statement. The number of rows affected will be returned.
+     * @param statement Unique identifier matching the statement to execute.
+     * @param parameter A parameter object to pass to the statement.
+     * @return int The number of rows affected by the delete.
+     */
+    int delete(String statement, Object parameter);
+
+    /**
+     * Flushes batch statements and commits database connection.
+     * Note that database connection will not be committed if no updates/deletes/inserts were called.
+     * To force the commit call {@link SqlSession#commit(boolean)}
+     */
+    void commit();
+
+    /**
+     * Flushes batch statements and commits database connection.
+     * @param force forces connection commit
+     */
+    void commit(boolean force);
+
+    /**
+     * Discards pending batch statements and rolls database connection back.
+     * Note that database connection will not be rolled back if no updates/deletes/inserts were called.
+     * To force the rollback call {@link SqlSession#rollback(boolean)}
+     */
+    void rollback();
+
+    /**
+     * Discards pending batch statements and rolls database connection back.
+     * Note that database connection will not be rolled back if no updates/deletes/inserts were called.
+     * @param force forces connection rollback
+     */
+    void rollback(boolean force);
+
+    /**
+     * Flushes batch statements.
+     * @return BatchResult list of updated records
+     * @since 3.0.6
+     */
+    List<BatchResult> flushStatements();
+
+    /**
+     * Closes the session.
+     */
+    @Override
+    void close();
+
+    /**
+     * Clears local session cache.
+     */
+    void clearCache();
+
+    /**
+     * Retrieves current configuration.
+     * @return DbConfig
+     */
+    DbConfig getDbConfig();
+
+    /**
+     * Retrieves a mapper.
+     * @param <T> the mapper type
+     * @param type Mapper interface class
+     * @return a mapper bound to this SqlSession
+     */
+    <T> T getMapper(Class<T> type);
+
+    /**
+     * Retrieves inner database connection.
+     * @return Connection
+     */
+    Connection getConnection();
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactory.java
new file mode 100644
index 00000000..26897c15
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactory.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import java.sql.Connection;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/4
+ */
+public interface SqlSessionFactory {
+
+    SqlSession openSession();
+
+    SqlSession openSession(boolean autoCommit);
+
+    SqlSession openSession(Connection connection);
+
+    SqlSession openSession(TransactionIsolationLevel level);
+
+    SqlSession openSession(SqlExecutorType execType);
+
+    SqlSession openSession(SqlExecutorType execType, boolean autoCommit);
+
+    SqlSession openSession(SqlExecutorType execType, TransactionIsolationLevel level);
+
+    SqlSession openSession(SqlExecutorType execType, Connection connection);
+
+    DbConfig getDbConfig();
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/TransactionIsolationLevel.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/TransactionIsolationLevel.java
new file mode 100644
index 00000000..553cc039
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/TransactionIsolationLevel.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.sql.Connection;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/4
+ */
+@Getter
+@AllArgsConstructor
+public enum TransactionIsolationLevel {
+    NONE(Connection.TRANSACTION_NONE),
+    READ_COMMITTED(Connection.TRANSACTION_READ_COMMITTED),
+    READ_UNCOMMITTED(Connection.TRANSACTION_READ_UNCOMMITTED),
+    REPEATABLE_READ(Connection.TRANSACTION_REPEATABLE_READ),
+    SERIALIZABLE(Connection.TRANSACTION_SERIALIZABLE);
+
+    private final int level;
+}
diff --git a/neutrino-proxy-server/src/main/resources/mapper/LicenseMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/DbOperator.xml
similarity index 100%
rename from neutrino-proxy-server/src/main/resources/mapper/LicenseMapper.xml
rename to neutrino-proxy-server/src/main/resources/mapper/DbOperator.xml

From f378f9e7447b1818273a315116541a6571c2c7bf Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 7 Nov 2022 15:59:28 +0800
Subject: [PATCH 39/55] =?UTF-8?q?CrispDbKit=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/crisp/DefaultSqlSessionFactory.java    |   6 +
 .../neutrino/core/db/crisp/JdbcException.java |  18 +++
 .../db/crisp/SqlSessionFactoryBuilder.java    |  32 +++++
 .../core/db/crisp/tx/JdbcTransaction.java     | 124 ++++++++++++++++++
 .../core/db/crisp/tx/Transaction.java         |  63 +++++++++
 .../db/crisp/tx/TransactionException.java     |  19 +++
 6 files changed, 262 insertions(+)
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/JdbcException.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactoryBuilder.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/Transaction.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/TransactionException.java

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java
index e57ba3b2..19eb347c 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java
@@ -29,6 +29,12 @@ import java.sql.Connection;
  */
 public class DefaultSqlSessionFactory implements SqlSessionFactory {
 
+    private final DbConfig config;
+
+    public DefaultSqlSessionFactory(DbConfig config) {
+        this.config = config;
+    }
+
     @Override
     public SqlSession openSession() {
         // TODO
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/JdbcException.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/JdbcException.java
new file mode 100644
index 00000000..664e9b98
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/JdbcException.java
@@ -0,0 +1,18 @@
+package fun.asgc.neutrino.core.db.crisp;
+
+import fun.asgc.neutrino.core.exception.InternalException;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/7
+ */
+public class JdbcException extends InternalException {
+
+    public JdbcException(String message) {
+        super(message);
+    }
+
+    public JdbcException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactoryBuilder.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactoryBuilder.java
new file mode 100644
index 00000000..ccd377e5
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactoryBuilder.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/7
+ */
+public class SqlSessionFactoryBuilder {
+    public SqlSessionFactory build(DbConfig config) {
+        return new DefaultSqlSessionFactory(config);
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java
new file mode 100644
index 00000000..98048119
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java
@@ -0,0 +1,124 @@
+package fun.asgc.neutrino.core.db.crisp.tx;
+
+import fun.asgc.neutrino.core.db.crisp.TransactionIsolationLevel;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/7
+ */
+@Slf4j
+public class JdbcTransaction implements Transaction {
+
+    protected Connection connection;
+    protected DataSource dataSource;
+    protected TransactionIsolationLevel level;
+    protected boolean autoCommit;
+
+    public JdbcTransaction(DataSource ds, TransactionIsolationLevel desiredLevel, boolean desiredAutoCommit) {
+        dataSource = ds;
+        level = desiredLevel;
+        autoCommit = desiredAutoCommit;
+    }
+
+    public JdbcTransaction(Connection connection) {
+        this.connection = connection;
+    }
+
+    @Override
+    public Connection getConnection() throws SQLException {
+        if (connection == null) {
+            openConnection();
+        }
+        return connection;
+    }
+
+    @Override
+    public void commit() throws SQLException {
+        if (connection != null && !connection.getAutoCommit()) {
+            if (log.isDebugEnabled()) {
+                log.debug("Committing JDBC Connection [" + connection + "]");
+            }
+            connection.commit();
+        }
+    }
+
+    @Override
+    public void rollback() throws SQLException {
+        if (connection != null && !connection.getAutoCommit()) {
+            if (log.isDebugEnabled()) {
+                log.debug("Rolling back JDBC Connection [" + connection + "]");
+            }
+            connection.rollback();
+        }
+    }
+
+    @Override
+    public void close() throws SQLException {
+        if (connection != null) {
+            resetAutoCommit();
+            if (log.isDebugEnabled()) {
+                log.debug("Closing JDBC Connection [" + connection + "]");
+            }
+            connection.close();
+        }
+    }
+
+    @Override
+    public Integer getTimeout() throws SQLException {
+        return null;
+    }
+
+    protected void openConnection() throws SQLException {
+        if (log.isDebugEnabled()) {
+            log.debug("Opening JDBC Connection");
+        }
+        connection = dataSource.getConnection();
+        if (level != null) {
+            connection.setTransactionIsolation(level.getLevel());
+        }
+        setDesiredAutoCommit(autoCommit);
+    }
+
+    protected void setDesiredAutoCommit(boolean desiredAutoCommit) {
+        try {
+            if (connection.getAutoCommit() != desiredAutoCommit) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Setting autocommit to " + desiredAutoCommit + " on JDBC Connection [" + connection + "]");
+                }
+                connection.setAutoCommit(desiredAutoCommit);
+            }
+        } catch (SQLException e) {
+            // Only a very poorly implemented driver would fail here,
+            // and there's not much we can do about that.
+            throw new TransactionException("Error configuring AutoCommit.  "
+                    + "Your driver may not support getAutoCommit() or setAutoCommit(). "
+                    + "Requested setting: " + desiredAutoCommit + ".  Cause: " + e, e);
+        }
+    }
+
+    protected void resetAutoCommit() {
+        try {
+            if (!connection.getAutoCommit()) {
+                // MyBatis does not call commit/rollback on a connection if just selects were performed.
+                // Some databases start transactions with select statements
+                // and they mandate a commit/rollback before closing the connection.
+                // A workaround is setting the autocommit to true before closing the connection.
+                // Sybase throws an exception here.
+                if (log.isDebugEnabled()) {
+                    log.debug("Resetting autocommit to true on JDBC Connection [" + connection + "]");
+                }
+                connection.setAutoCommit(true);
+            }
+        } catch (SQLException e) {
+            if (log.isDebugEnabled()) {
+                log.debug("Error resetting autocommit to true "
+                        + "before closing the connection.  Cause: " + e);
+            }
+        }
+    }
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/Transaction.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/Transaction.java
new file mode 100644
index 00000000..65baaf8e
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/Transaction.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp.tx;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/7
+ */
+public interface Transaction {
+
+    /**
+     * Retrieve inner database connection.
+     * @return DataBase connection
+     * @throws SQLException
+     */
+    Connection getConnection() throws SQLException;
+
+    /**
+     * Commit inner database connection.
+     * @throws SQLException
+     */
+    void commit() throws SQLException;
+
+    /**
+     * Rollback inner database connection.
+     * @throws SQLException
+     */
+    void rollback() throws SQLException;
+
+    /**
+     * Close inner database connection.
+     * @throws SQLException
+     */
+    void close() throws SQLException;
+
+    /**
+     * Get transaction timeout if set.
+     * @throws SQLException
+     */
+    Integer getTimeout() throws SQLException;
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/TransactionException.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/TransactionException.java
new file mode 100644
index 00000000..853fc704
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/TransactionException.java
@@ -0,0 +1,19 @@
+package fun.asgc.neutrino.core.db.crisp.tx;
+
+import fun.asgc.neutrino.core.db.crisp.JdbcException;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/7
+ */
+public class TransactionException extends JdbcException {
+
+    public TransactionException(String message) {
+        super(message);
+    }
+
+    public TransactionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}

From de59752bb915fbe8dc19772957822b874ce67794 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 10 Nov 2022 17:52:06 +0800
Subject: [PATCH 40/55] =?UTF-8?q?CrispDbKit=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java | 3 +++
 .../java/fun/asgc/neutrino/core/db/crisp/DbContext.java     | 2 ++
 .../java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java    | 3 +++
 .../java/fun/asgc/neutrino/core/db/crisp/DbOperator.java    | 2 ++
 .../asgc/neutrino/core/db/crisp/{ => base}/BatchResult.java | 2 +-
 .../neutrino/core/db/crisp/{ => base}/DbUpdateResult.java   | 2 +-
 .../neutrino/core/db/crisp/{ => base}/MappedStatement.java  | 2 +-
 .../asgc/neutrino/core/db/crisp/{ => base}/RowBounds.java   | 2 +-
 .../neutrino/core/db/crisp/{ => base}/SqlExecutorType.java  | 2 +-
 .../core/db/crisp/{ => ds}/DefaultDataSourceProvider.java   | 2 +-
 .../core/db/crisp/{ => ds}/IDataSourceProvider.java         | 2 +-
 .../db/crisp/{ => session}/DefaultSqlSessionFactory.java    | 6 +++++-
 .../neutrino/core/db/crisp/{ => session}/SqlSession.java    | 5 ++++-
 .../core/db/crisp/{ => session}/SqlSessionFactory.java      | 6 +++++-
 .../db/crisp/{ => session}/SqlSessionFactoryBuilder.java    | 4 +++-
 .../fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java | 1 -
 .../core/db/crisp/{ => tx}/TransactionIsolationLevel.java   | 2 +-
 17 files changed, 35 insertions(+), 13 deletions(-)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => base}/BatchResult.java (98%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => base}/DbUpdateResult.java (96%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => base}/MappedStatement.java (96%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => base}/RowBounds.java (97%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => base}/SqlExecutorType.java (96%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => ds}/DefaultDataSourceProvider.java (97%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => ds}/IDataSourceProvider.java (96%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => session}/DefaultSqlSessionFactory.java (91%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => session}/SqlSession.java (97%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => session}/SqlSessionFactory.java (88%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => session}/SqlSessionFactoryBuilder.java (93%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/{ => tx}/TransactionIsolationLevel.java (97%)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java
index 7d1529ff..9ee65ced 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbConfig.java
@@ -21,6 +21,9 @@
  */
 package fun.asgc.neutrino.core.db.crisp;
 
+import fun.asgc.neutrino.core.db.crisp.ds.DefaultDataSourceProvider;
+import fun.asgc.neutrino.core.db.crisp.ds.IDataSourceProvider;
+
 import javax.sql.DataSource;
 
 /**
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java
index 36c378ce..78f9ef4b 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbContext.java
@@ -21,6 +21,8 @@
  */
 package fun.asgc.neutrino.core.db.crisp;
 
+import fun.asgc.neutrino.core.db.crisp.session.SqlSessionFactory;
+
 import java.sql.Connection;
 
 /**
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java
index 11b344d4..8851b75a 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbExecutor.java
@@ -21,6 +21,9 @@
  */
 package fun.asgc.neutrino.core.db.crisp;
 
+import fun.asgc.neutrino.core.db.crisp.base.DbUpdateResult;
+import fun.asgc.neutrino.core.db.crisp.ds.IDataSourceProvider;
+
 import javax.sql.DataSource;
 import java.util.List;
 
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java
index e2775d39..1e114cf7 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbOperator.java
@@ -21,6 +21,8 @@
  */
 package fun.asgc.neutrino.core.db.crisp;
 
+import fun.asgc.neutrino.core.db.crisp.base.DbUpdateResult;
+
 import java.util.List;
 
 /**
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/BatchResult.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/BatchResult.java
similarity index 98%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/BatchResult.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/BatchResult.java
index 74665b9c..982b3198 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/BatchResult.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/BatchResult.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.base;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbUpdateResult.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/DbUpdateResult.java
similarity index 96%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbUpdateResult.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/DbUpdateResult.java
index 41d4e32e..91e7a423 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DbUpdateResult.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/DbUpdateResult.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.base;
 
 /**
  * @author: aoshiguchen
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/MappedStatement.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/MappedStatement.java
similarity index 96%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/MappedStatement.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/MappedStatement.java
index 6c68cc6b..c2459d9b 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/MappedStatement.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/MappedStatement.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.base;
 
 /**
  * @author: aoshiguchen
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/RowBounds.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/RowBounds.java
similarity index 97%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/RowBounds.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/RowBounds.java
index dddbdc58..461c1e79 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/RowBounds.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/RowBounds.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.base;
 
 /**
  * @author: aoshiguchen
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlExecutorType.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/SqlExecutorType.java
similarity index 96%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlExecutorType.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/SqlExecutorType.java
index 19fe0ae7..802e513a 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlExecutorType.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/base/SqlExecutorType.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.base;
 
 /**
  * @author: aoshiguchen
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultDataSourceProvider.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/DefaultDataSourceProvider.java
similarity index 97%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultDataSourceProvider.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/DefaultDataSourceProvider.java
index 123c75d2..4d49288c 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultDataSourceProvider.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/DefaultDataSourceProvider.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.ds;
 
 import javax.sql.DataSource;
 
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/IDataSourceProvider.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/IDataSourceProvider.java
similarity index 96%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/IDataSourceProvider.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/IDataSourceProvider.java
index 34cf6a3f..fa748d58 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/IDataSourceProvider.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/ds/IDataSourceProvider.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.ds;
 
 import javax.sql.DataSource;
 
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/DefaultSqlSessionFactory.java
similarity index 91%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/DefaultSqlSessionFactory.java
index 19eb347c..fa613d44 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/DefaultSqlSessionFactory.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/DefaultSqlSessionFactory.java
@@ -19,7 +19,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.session;
+
+import fun.asgc.neutrino.core.db.crisp.DbConfig;
+import fun.asgc.neutrino.core.db.crisp.base.SqlExecutorType;
+import fun.asgc.neutrino.core.db.crisp.tx.TransactionIsolationLevel;
 
 import java.sql.Connection;
 
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSession.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSession.java
similarity index 97%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSession.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSession.java
index 94e98e08..6f2fd629 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSession.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSession.java
@@ -19,8 +19,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.session;
 
+import fun.asgc.neutrino.core.db.crisp.base.BatchResult;
+import fun.asgc.neutrino.core.db.crisp.DbConfig;
+import fun.asgc.neutrino.core.db.crisp.base.RowBounds;
 import sun.plugin2.main.server.ResultHandler;
 
 import java.io.Closeable;
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactory.java
similarity index 88%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactory.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactory.java
index 26897c15..ebd82cc0 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactory.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactory.java
@@ -19,7 +19,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.session;
+
+import fun.asgc.neutrino.core.db.crisp.DbConfig;
+import fun.asgc.neutrino.core.db.crisp.base.SqlExecutorType;
+import fun.asgc.neutrino.core.db.crisp.tx.TransactionIsolationLevel;
 
 import java.sql.Connection;
 
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactoryBuilder.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactoryBuilder.java
similarity index 93%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactoryBuilder.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactoryBuilder.java
index ccd377e5..ff77cc3f 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/SqlSessionFactoryBuilder.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSessionFactoryBuilder.java
@@ -19,7 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.session;
+
+import fun.asgc.neutrino.core.db.crisp.DbConfig;
 
 /**
  * @author: aoshiguchen
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java
index 98048119..9e971f94 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/JdbcTransaction.java
@@ -1,6 +1,5 @@
 package fun.asgc.neutrino.core.db.crisp.tx;
 
-import fun.asgc.neutrino.core.db.crisp.TransactionIsolationLevel;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.sql.DataSource;
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/TransactionIsolationLevel.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/TransactionIsolationLevel.java
similarity index 97%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/TransactionIsolationLevel.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/TransactionIsolationLevel.java
index 553cc039..78afa711 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/TransactionIsolationLevel.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/tx/TransactionIsolationLevel.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.db.crisp;
+package fun.asgc.neutrino.core.db.crisp.tx;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

From 04841dcbd99fe47d159afb6d4f5e84594a53da6a Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 21 Nov 2022 13:50:30 +0800
Subject: [PATCH 41/55] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96sql=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-server/src/main/resources/sql/job_info.data.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
index aad12b24..bdd030d6 100644
--- a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
@@ -10,4 +10,4 @@ INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
 (5, '流量统计报表-天', 'FlowReportForDayJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(6, '流量统计报表-月', 'FlowReportForMonthJob', '0 10 0 1 * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file
+(6, '流量统计报表-月', 'FlowReportForMonthJob', '0 30 1 1 * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file

From d24ef43f4592801d7db97e4be385c052779182e5 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 21 Nov 2022 13:52:05 +0800
Subject: [PATCH 42/55] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96sql=E8=84=9A=E6=9C=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-server/src/main/resources/sql/init-structure.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
index ae0762c8..9a07b05e 100644
--- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
@@ -72,7 +72,7 @@ CREATE TABLE IF NOT EXISTS `user_login_record` (
     `type` INTEGER(2) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
 );
-#客户端链接记录表
+#客户端连接记录表
 CREATE TABLE IF NOT EXISTS `client_connect_record` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     `user_id` INTEGER NOT NULL,

From c79d2937cc17dfa5f682102ecda15b1ff5448f26 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 21 Nov 2022 13:57:01 +0800
Subject: [PATCH 43/55] =?UTF-8?q?=E5=88=A0=E9=99=A4ZWSP=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-server/src/main/resources/logback.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/resources/logback.xml b/neutrino-proxy-server/src/main/resources/logback.xml
index 1dc705e4..7b864774 100644
--- a/neutrino-proxy-server/src/main/resources/logback.xml
+++ b/neutrino-proxy-server/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <property name="LOG_FILE" value="/work/project/neutrino-proxy/server.log"/>​
+    <property name="LOG_FILE" value="/work/project/neutrino-proxy/server.log"/>
     <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n"/>
     <property name="ENCODE" value="utf8" />
 

From 98f855505d0bccd119ec5d4e43e7865097707f85 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 10:07:05 +0800
Subject: [PATCH 44/55] =?UTF-8?q?=E8=A7=A3=E5=86=B3license=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/{DbOperator.xml => LicenseMapper.xml}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename neutrino-proxy-server/src/main/resources/mapper/{DbOperator.xml => LicenseMapper.xml} (100%)

diff --git a/neutrino-proxy-server/src/main/resources/mapper/DbOperator.xml b/neutrino-proxy-server/src/main/resources/mapper/LicenseMapper.xml
similarity index 100%
rename from neutrino-proxy-server/src/main/resources/mapper/DbOperator.xml
rename to neutrino-proxy-server/src/main/resources/mapper/LicenseMapper.xml

From 8033666a705490d065e8ce0423ce7e215396ba7a Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 10:09:48 +0800
Subject: [PATCH 45/55] =?UTF-8?q?=E8=A7=A3=E5=86=B3license=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asgc/neutrino/proxy/server/service/LicenseService.java | 2 +-
 .../asgc/neutrino/proxy/server/util/ParamCheckUtil.java    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
index a744706c..4da7fe49 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
@@ -125,7 +125,7 @@ public class LicenseService {
 		ParamCheckUtil.checkNotNull(oldLicenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
 
 		LicenseDO licenseCheck = licenseMapper.checkRepeat(oldLicenseDO.getUserId(), req.getName(), Sets.newHashSet(oldLicenseDO.getId()));
-		ParamCheckUtil.checkNotNull(licenseCheck, ExceptionConstant.LICENSE_NAME_CANNOT_REPEAT);
+		ParamCheckUtil.checkMustNull(licenseCheck, ExceptionConstant.LICENSE_NAME_CANNOT_REPEAT);
 
 		licenseMapper.update(req.getId(), req.getName(), new Date());
 		return new LicenseUpdateRes();
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java
index f1980e10..7dc59f49 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java
@@ -66,6 +66,13 @@ public class ParamCheckUtil {
 		}
 	}
 
+	public static void checkMustNull(Object obj, ExceptionConstant constant, Object... params) {
+		if (null != obj) {
+			throw ServiceException.create(constant, params);
+		}
+	}
+
+
 	public static void checkNotNull(Object obj, ExceptionConstant constant, Object... params) {
 		if (null == obj) {
 			throw ServiceException.create(constant, params);

From 639d7d1707a87f2e57fd1bb998c4736bf0f9a522 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 10:42:12 +0800
Subject: [PATCH 46/55] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=AE=B0=E5=BD=95=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/entity/UserConnectRecordDO.java       | 84 -------------------
 .../src/main/resources/sql/init-structure.sql | 19 -----
 2 files changed, 103 deletions(-)
 delete mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserConnectRecordDO.java

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserConnectRecordDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserConnectRecordDO.java
deleted file mode 100644
index 70435504..00000000
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserConnectRecordDO.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package fun.asgc.neutrino.proxy.server.dal.entity;
-
-import fun.asgc.neutrino.core.db.annotation.Table;
-import lombok.Data;
-import lombok.ToString;
-
-import java.util.Date;
-
-/**
- *
- * @author: aoshiguchen
- * @date: 2022/8/31
- */
-@ToString
-@Data
-@Table("user_connect_record")
-public class UserConnectRecordDO {
-	private Integer id;
-	/**
-	 * 服务端端口号
-	 */
-	private Integer serverPort;
-	/**
-	 * userIp
-	 */
-	private String userIp;
-	/**
-	 * 客户端IP
-	 */
-	private String clientIp;
-	/**
-	 * 客户端信息
-	 */
-	private String clientLanInfo;
-	/**
-	 * 用户ID
-	 */
-	private String userId;
-	/**
-	 * licenseId
-	 */
-	private Integer licenseId;
-	/**
-	 * licenseKey
-	 */
-	private String licenseKey;
-	/**
-	 * writeBytes
-	 */
-	private Integer writeBytes;
-	/**
-	 * readBytes
-	 */
-	private Integer readBytes;
-	/**
-	 * type
-	 */
-	private Integer type;
-	/**
-	 * 创建时间
-	 */
-	private Date createTime;
-}
diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
index 9a07b05e..424fc281 100644
--- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
@@ -79,28 +79,9 @@ CREATE TABLE IF NOT EXISTS `client_connect_record` (
     `ip` VARCHAR(50) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
     `license_key` VARCHAR(100) NOT NULL,
-    `write_bytes` INTEGER(20) DEFAULT NULL,
-    `read_bytes` INTEGER(20) DEFAULT NULL,
     `type` INTEGER(2) NOT NULL,
     `create_time` INTEGER(20) NOT NULL
 );
-
-#用户连接记录表
-CREATE TABLE IF NOT EXISTS `user_connect_record` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    `server_port` INTEGER NOT NULL,
-    `user_ip` VARCHAR(50) NOT NULL,
-    `client_ip` VARCHAR(50) NOT NULL,
-    `client_lan_info` VARCHAR(50) NOT NULL,
-    `user_id` INTEGER NOT NULL,
-    `license_id` INTEGER(20) NOT NULL,
-    `license_key` VARCHAR(100) NOT NULL,
-    `write_bytes` INTEGER(20) DEFAULT NULL,
-    `read_bytes` INTEGER(20) DEFAULT NULL,
-    `type` INTEGER(2) NOT NULL,
-    `create_time` INTEGER(20) NOT NULL
-    );
-
 #############################调度管理相关表#############################
 #触发器信息表
 CREATE TABLE IF NOT EXISTS `job_info` (

From 44909e20b5ae84d0290ee1442b2a755ce03bcc1c Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 11:15:28 +0800
Subject: [PATCH 47/55] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/base/rest/SystemContextHolder.java |  8 ++++++-
 .../server/constant/ExceptionConstant.java    |  3 +++
 .../server/controller/UserController.java     | 23 +++++++++++++++++++
 .../controller/req/UserUpdatePasswordReq.java |  1 +
 .../neutrino/proxy/server/dal/UserMapper.java |  1 -
 .../proxy/server/dal/UserTokenMapper.java     |  9 ++++++--
 .../proxy/server/service/UserService.java     | 13 +++++++++--
 todolist.MD                                   | 14 +++++------
 8 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/SystemContextHolder.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/SystemContextHolder.java
index dd17253f..936d5bfb 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/SystemContextHolder.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/SystemContextHolder.java
@@ -40,7 +40,13 @@ public class SystemContextHolder {
 	}
 
 	public static UserDO getUser() {
-		return systemContextHolder.get().getUser();
+		SystemContext context = getContext();
+		return (null == context) ? null : context.getUser();
+	}
+
+	public static Integer getUserId() {
+		UserDO userDO = getUser();
+		return (null == userDO) ? null : userDO.getId();
 	}
 
 	public static String getToken() {
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java
index c72bfc2e..c1cc6505 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java
@@ -45,6 +45,9 @@ public enum ExceptionConstant {
 	// license管理(12000)
 	LICENSE_NAME_CANNOT_REPEAT(12000, "license名称不能重复"),
 	LICENSE_NOT_EXIST(12001, "license数据不存在"),
+	ORIGIN_PASSWORD_CHECK_FAIL(12002, "原密码验证失败"),
+	LOGIN_PASSWORD_LENGTH_CHECK_FAIL(12003, "登录密码不能小于6位数"),
+	LOGIN_PASSWORD_NO_CHANGE_MODIFY_FAIL(12004, "密码没有变化，修改失败"),
 	// 端口池管理(13000)
 	PORT_CANNOT_REPEAT(13000,"端口不能重复"),
 	PORT_NOT_EXIST(13001, "该端口在端口池中不存在，不允许映射"),
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java
index 0a8eb65f..c61affdd 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java
@@ -26,10 +26,15 @@ import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.core.web.annotation.*;
+import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder;
 import fun.asgc.neutrino.proxy.server.base.rest.annotation.OnlyAdmin;
+import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
 import fun.asgc.neutrino.proxy.server.controller.req.*;
 import fun.asgc.neutrino.proxy.server.controller.res.*;
+import fun.asgc.neutrino.proxy.server.dal.UserMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
 import fun.asgc.neutrino.proxy.server.service.UserService;
+import fun.asgc.neutrino.proxy.server.util.Md5Util;
 import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
 
 import java.util.List;
@@ -45,6 +50,8 @@ import java.util.List;
 public class UserController {
 	@Autowired
 	private UserService userService;
+	@Autowired
+	private UserMapper userMapper;
 
 	@GetMapping("page")
 	public Page<UserListRes> page(PageQuery pageQuery, UserListReq req) {
@@ -101,6 +108,22 @@ public class UserController {
 		ParamCheckUtil.checkNotNull(req, "req");
 		ParamCheckUtil.checkNotNull(req.getId(), "id");
 		ParamCheckUtil.checkNotEmpty(req.getLoginPassword(), "loginPassword");
+		ParamCheckUtil.checkExpression(req.getLoginPassword().length() >= 6, ExceptionConstant.LOGIN_PASSWORD_LENGTH_CHECK_FAIL);
+
+		return userService.updatePassword(req);
+	}
+
+	@PostMapping("current-user/update/password")
+	public UserUpdatePasswordRes currentUserUpdatePassword(@RequestBody UserUpdatePasswordReq req) {
+		ParamCheckUtil.checkNotNull(req, "req");
+		ParamCheckUtil.checkNotEmpty(req.getOldLoginPassword(), "oldLoginPassword");
+		ParamCheckUtil.checkNotEmpty(req.getLoginPassword(), "loginPassword");
+		req.setId(SystemContextHolder.getUserId());
+		ParamCheckUtil.checkExpression(req.getLoginPassword().length() >= 6, ExceptionConstant.LOGIN_PASSWORD_LENGTH_CHECK_FAIL);
+		// 验证原密码
+		Integer userId = req.getId();
+		UserDO userDO = userMapper.findById(userId);
+		ParamCheckUtil.checkExpression(Md5Util.encode(req.getOldLoginPassword()).equals(userDO.getLoginPassword()), ExceptionConstant.ORIGIN_PASSWORD_CHECK_FAIL);
 
 		return userService.updatePassword(req);
 	}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdatePasswordReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdatePasswordReq.java
index f4312382..385eea07 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdatePasswordReq.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/UserUpdatePasswordReq.java
@@ -31,5 +31,6 @@ import lombok.Data;
 @Data
 public class UserUpdatePasswordReq {
 	private Integer id;
+	private String oldLoginPassword;
 	private String loginPassword;
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java
index 4335ac5e..d8d22359 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java
@@ -29,7 +29,6 @@ import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.proxy.server.controller.req.UserListReq;
 import fun.asgc.neutrino.proxy.server.controller.res.UserListRes;
-import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
 
 import java.util.Date;
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java
index c672e9c0..c3673d80 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java
@@ -25,8 +25,6 @@ import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Param;
 import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.Delete;
-import fun.asgc.neutrino.core.db.annotation.Insert;
-import fun.asgc.neutrino.core.db.annotation.Select;
 import fun.asgc.neutrino.core.db.annotation.Update;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.proxy.server.dal.entity.UserTokenDO;
@@ -69,4 +67,11 @@ public interface UserTokenMapper extends SqlMapper {
 
 	@Update("update user_token set expiration_time = :expirationTime where token = :token")
 	void updateTokenExpirationTime(@Param("token") String token, @Param("expirationTime") Date expirationTime);
+
+	/**
+	 * 根据userId删除token
+	 * @param userId
+	 */
+	@Delete("delete from user_token where user_id = ?")
+	void deleteByUserId(Integer userId);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java
index bd6d827b..e45d08dd 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java
@@ -27,10 +27,10 @@ import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.core.util.DateUtil;
-import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
-import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
 import fun.asgc.neutrino.proxy.server.base.rest.ServiceException;
 import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder;
+import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
+import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
 import fun.asgc.neutrino.proxy.server.controller.req.*;
 import fun.asgc.neutrino.proxy.server.controller.res.*;
 import fun.asgc.neutrino.proxy.server.dal.UserLoginRecordMapper;
@@ -40,6 +40,7 @@ import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.UserTokenDO;
 import fun.asgc.neutrino.proxy.server.util.Md5Util;
+import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -192,8 +193,16 @@ public class UserService {
 	}
 
 	public UserUpdatePasswordRes updatePassword(UserUpdatePasswordReq req) {
+		UserDO userDO = userMapper.findById(req.getId());
+		// 更新密码
 		String loginPassword = Md5Util.encode(req.getLoginPassword());
+		ParamCheckUtil.checkExpression(!userDO.getLoginPassword().equals(loginPassword), ExceptionConstant.LOGIN_PASSWORD_NO_CHANGE_MODIFY_FAIL);
+
 		userMapper.updateLoginPassword(req.getId(), loginPassword, new Date());
+
+		// 删除该用户所有token
+		userTokenMapper.deleteByUserId(req.getId());
+
 		return new UserUpdatePasswordRes();
 	}
 
diff --git a/todolist.MD b/todolist.MD
index 149ba0e1..35717e6d 100644
--- a/todolist.MD
+++ b/todolist.MD
@@ -1,7 +1,7 @@
-- 测试及优化代理稳定性
-- 完成剩余的调度管理日志功能
-- 增加日志管理（登录日志、客户端连接日志、调度执行日志）
-- 增加简单的流量统计
-    - 基于用户粒度的上下行流量累计
-- 完善补充代码文档
-- 优化底层框架
\ No newline at end of file
+# BUG
+- neutrino-proxy-admin 打包后启动，token失效不会跳回登录页面
+
+# 优化
+- 调度管理，增加查看按钮，解决异常情况下，列表展示堆栈异常信息不全，不方便查看的问题
+- 用户列表增加修改密码入口，管理员可以修改指定用户密码，无需验证原密码（仅管理员操作
+- 增加当前登录用户修改自己密码的功能，需要验证原密码
\ No newline at end of file

From 09424a7f07980946d3237f439c4cbde2f64f1cbd Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 11:33:25 +0800
Subject: [PATCH 48/55] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B8=85=E7=90=86job?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/dal/ClientConnectRecordMapper.java | 14 +++++++
 .../proxy/server/dal/DataCleanMapper.java     |  5 +++
 .../dal/entity/ClientConnectRecordDO.java     | 38 +++++++++++++++++++
 .../proxy/server/job/DataCleanJob.java        | 34 +++++++++++++++--
 .../src/main/resources/sql/init-structure.sql |  3 ++
 5 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java
new file mode 100644
index 00000000..1ba5bf0d
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java
@@ -0,0 +1,14 @@
+package fun.asgc.neutrino.proxy.server.dal;
+
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.aop.Intercept;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/23
+ */
+@Intercept(ignoreGlobal = true)
+@Component
+public class ClientConnectRecordMapper {
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java
index dc1d588d..4bf599d8 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java
@@ -37,4 +37,9 @@ public interface DataCleanMapper extends SqlMapper {
     @Delete("delete from `job_log` where create_time < ?")
     void cleanJobLog(long date);
 
+    @Delete("delete from `user_login_record` where create_time < ?")
+    void cleanUserLoginRecord(long date);
+
+    @Delete("delete from `client_connect_record` where create_time < ?")
+    void cleanClientConnectRecord(long date);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java
new file mode 100644
index 00000000..ed5279ab
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java
@@ -0,0 +1,38 @@
+package fun.asgc.neutrino.proxy.server.dal.entity;
+
+import fun.asgc.neutrino.core.db.annotation.Id;
+import fun.asgc.neutrino.core.db.annotation.Table;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/23
+ */
+@ToString
+@Accessors(chain = true)
+@Data
+@Table("client_connect_record")
+public class ClientConnectRecordDO {
+    @Id
+    private Integer id;
+    private Integer userId;
+    private String ip;
+    private Integer licenseId;
+    private String licenseKey;
+    private Integer type;
+    private String msg;
+    /**
+     * 1、成功
+     * 2、失败
+     */
+    private Integer code;
+    private String err;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java
index 87ccbfed..d3345b10 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java
@@ -55,14 +55,36 @@ public class DataCleanJob implements IJobHandler {
      * Job日志保存天数
      */
     private static final Integer JOB_LOG_KEEP_DAYS = 7;
+    /**
+     * 用户登录日志保留天数
+     */
+    private static final Integer USER_LOGIN_RECORD_KEEP_DAYS = 30;
+    /**
+     * 客户端连接记录保留天数
+     */
+    private static final Integer CLIENT_CONNECT_RECORD_KEEP_DAYS = 30;
 
     @Override
     public void execute(String s) throws Exception {
         JobParams jobParams = getParams(s);
 
-        Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getJobLogKeepDays());
-        log.info("清理调度管理日志 date:{}", sdf.format(date));
-        dataCleanMapper.cleanJobLog(date.getTime());
+        {
+            Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getJobLogKeepDays());
+            log.info("清理调度管理日志 date:{}", sdf.format(date));
+            dataCleanMapper.cleanJobLog(date.getTime());
+        }
+
+        {
+            Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getUserLoginRecordKeepDays());
+            log.info("清理用户登录日志 date:{}", sdf.format(date));
+            dataCleanMapper.cleanUserLoginRecord(date.getTime());
+        }
+
+        {
+            Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getClientConnectRecordKeepDays());
+            log.info("清理客户端连接日志 date:{}", sdf.format(date));
+            dataCleanMapper.cleanClientConnectRecord(date.getTime());
+        }
     }
 
     public static JobParams getParams(String s) {
@@ -74,12 +96,16 @@ public class DataCleanJob implements IJobHandler {
             // ignore
         }
         return new JobParams()
-                .setJobLogKeepDays(JOB_LOG_KEEP_DAYS);
+                .setJobLogKeepDays(JOB_LOG_KEEP_DAYS)
+                .setUserLoginRecordKeepDays(USER_LOGIN_RECORD_KEEP_DAYS)
+                .setClientConnectRecordKeepDays(CLIENT_CONNECT_RECORD_KEEP_DAYS);
     }
 
     @Accessors(chain = true)
     @Data
     public static class JobParams {
         private Integer jobLogKeepDays;
+        private Integer userLoginRecordKeepDays;
+        private Integer clientConnectRecordKeepDays;
     }
 }
diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
index 424fc281..406f7884 100644
--- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
@@ -80,6 +80,9 @@ CREATE TABLE IF NOT EXISTS `client_connect_record` (
     `license_id` INTEGER(20) NOT NULL,
     `license_key` VARCHAR(100) NOT NULL,
     `type` INTEGER(2) NOT NULL,
+    `msg` VARCHAR(512) DEFAULT NULL,
+    `code` INTEGER(2) NOT NULL,
+    `err` VARCHAR(512) DEFAULT NULL,
     `create_time` INTEGER(20) NOT NULL
 );
 #############################调度管理相关表#############################

From c2ccb9d2c73bb34a0d9c069702f692ad9c63c2c4 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 13:51:49 +0800
Subject: [PATCH 49/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=BF=9E=E6=8E=A5=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/ClientConnectTypeEnum.java       | 39 +++++++++++++
 .../server/constant/SuccessCodeEnum.java      | 39 +++++++++++++
 .../server/dal/ClientConnectRecordMapper.java |  5 +-
 .../dal/entity/ClientConnectRecordDO.java     |  2 -
 .../proxy/core/ServerChannelHandler.java      | 15 +++++
 .../handler/ProxyMessageAuthHandler.java      | 58 +++++++++++++++++++
 .../service/ClientConnectRecordService.java   | 45 ++++++++++++++
 .../mapper/ClientConnectRecordMapper.xml      |  7 +++
 .../src/main/resources/sql/init-structure.sql |  4 +-
 9 files changed, 208 insertions(+), 6 deletions(-)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ClientConnectTypeEnum.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/SuccessCodeEnum.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java
 create mode 100644 neutrino-proxy-server/src/main/resources/mapper/ClientConnectRecordMapper.xml

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ClientConnectTypeEnum.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ClientConnectTypeEnum.java
new file mode 100644
index 00000000..8f2851cb
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ClientConnectTypeEnum.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/23
+ */
+@Getter
+@AllArgsConstructor
+public enum ClientConnectTypeEnum {
+    CONNECT(1, "连接"),
+    DISCONNECT(2, "断开连接");
+
+    private Integer type;
+    private String desc;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/SuccessCodeEnum.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/SuccessCodeEnum.java
new file mode 100644
index 00000000..2c0a6e12
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/SuccessCodeEnum.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/23
+ */
+@Getter
+@AllArgsConstructor
+public enum SuccessCodeEnum {
+    SUCCESS(1, "成功"),
+    FAIL(2, "失败");
+
+    private Integer code;
+    private String desc;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java
index 1ba5bf0d..42ecd441 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java
@@ -2,6 +2,8 @@ package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO;
 
 /**
  * @author: aoshiguchen
@@ -9,6 +11,7 @@ import fun.asgc.neutrino.core.aop.Intercept;
  */
 @Intercept(ignoreGlobal = true)
 @Component
-public class ClientConnectRecordMapper {
+public interface ClientConnectRecordMapper extends SqlMapper {
 
+    void add(ClientConnectRecordDO clientConnectRecordDO);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java
index ed5279ab..4a6fb795 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java
@@ -19,10 +19,8 @@ import java.util.Date;
 public class ClientConnectRecordDO {
     @Id
     private Integer id;
-    private Integer userId;
     private String ip;
     private Integer licenseId;
-    private String licenseKey;
     private Integer type;
     private String msg;
     /**
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ServerChannelHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ServerChannelHandler.java
index b6eaa465..1b46caca 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ServerChannelHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ServerChannelHandler.java
@@ -24,9 +24,14 @@ package fun.asgc.neutrino.proxy.server.proxy.core;
 
 import fun.asgc.neutrino.core.base.Dispatcher;
 import fun.asgc.neutrino.core.util.BeanManager;
+import fun.asgc.neutrino.core.util.ChannelUtil;
 import fun.asgc.neutrino.proxy.core.Constants;
 import fun.asgc.neutrino.proxy.core.ProxyMessage;
+import fun.asgc.neutrino.proxy.server.constant.ClientConnectTypeEnum;
+import fun.asgc.neutrino.proxy.server.constant.SuccessCodeEnum;
+import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO;
 import fun.asgc.neutrino.proxy.server.proxy.domain.CmdChannelAttachInfo;
+import fun.asgc.neutrino.proxy.server.service.ClientConnectRecordService;
 import fun.asgc.neutrino.proxy.server.service.ProxyMutualService;
 import fun.asgc.neutrino.proxy.server.util.ProxyUtil;
 import io.netty.buffer.Unpooled;
@@ -34,6 +39,8 @@ import io.netty.channel.*;
 import io.netty.handler.timeout.IdleStateEvent;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Date;
+
 /**
  *
  * @author: aoshiguchen
@@ -81,6 +88,14 @@ public class ServerChannelHandler extends SimpleChannelInboundHandler<ProxyMessa
             CmdChannelAttachInfo cmdChannelAttachInfo = ProxyUtil.getAttachInfo(ctx.channel());
             if (null != cmdChannelAttachInfo) {
                 BeanManager.getBean(ProxyMutualService.class).offline(cmdChannelAttachInfo);
+                BeanManager.getBean(ClientConnectRecordService.class).add(new ClientConnectRecordDO()
+                        .setIp(ChannelUtil.getIP(ctx.channel()))
+                        .setLicenseId(cmdChannelAttachInfo.getLicenseId())
+                        .setType(ClientConnectTypeEnum.DISCONNECT.getType())
+                        .setMsg("")
+                        .setCode(SuccessCodeEnum.SUCCESS.getCode())
+                        .setCreateTime(new Date())
+                );
             }
             ProxyUtil.removeCmdChannel(ctx.channel());
         }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
index 51de8825..6055ee10 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java
@@ -26,11 +26,15 @@ import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Match;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.util.ChannelUtil;
 import fun.asgc.neutrino.core.util.CollectionUtil;
 import fun.asgc.neutrino.core.util.StringUtil;
 import fun.asgc.neutrino.proxy.core.*;
 import fun.asgc.neutrino.proxy.server.base.proxy.ProxyConfig;
+import fun.asgc.neutrino.proxy.server.constant.ClientConnectTypeEnum;
 import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
+import fun.asgc.neutrino.proxy.server.constant.SuccessCodeEnum;
+import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
@@ -50,6 +54,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
 import lombok.extern.slf4j.Slf4j;
 
 import java.net.BindException;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -79,36 +84,89 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler {
 	private ProxyMutualService proxyMutualService;
 	@Autowired
 	private FlowReportService flowReportService;
+	@Autowired
+	private ClientConnectRecordService clientConnectRecordService;
 
 	@Override
 	public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
+		String ip = ChannelUtil.getIP(ctx.channel());
+		Date now = new Date();
+
 		String licenseKey = proxyMessage.getInfo();
 		if (StringUtil.isEmpty(licenseKey)) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license不能为空!", licenseKey));
+			clientConnectRecordService.add(new ClientConnectRecordDO()
+					.setIp(ip)
+					.setType(ClientConnectTypeEnum.CONNECT.getType())
+					.setMsg(licenseKey)
+					.setCode(SuccessCodeEnum.FAIL.getCode())
+					.setErr("license不能为空!")
+					.setCreateTime(now)
+			);
 			return;
 		}
 		LicenseDO licenseDO = licenseService.findByKey(licenseKey);
 		if (null == licenseDO) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license不存在!", licenseKey));
+			clientConnectRecordService.add(new ClientConnectRecordDO()
+					.setIp(ip)
+					.setType(ClientConnectTypeEnum.CONNECT.getType())
+					.setMsg(licenseKey)
+					.setCode(SuccessCodeEnum.FAIL.getCode())
+					.setErr("license不存在!")
+					.setCreateTime(now)
+			);
 			return;
 		}
 		if (EnableStatusEnum.DISABLE.getStatus().equals(licenseDO.getEnable())) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license已被禁用!", licenseKey));
+			clientConnectRecordService.add(new ClientConnectRecordDO()
+					.setIp(ip)
+					.setLicenseId(licenseDO.getId())
+					.setType(ClientConnectTypeEnum.CONNECT.getType())
+					.setMsg(licenseKey)
+					.setCode(SuccessCodeEnum.FAIL.getCode())
+					.setErr("当前license已被禁用!")
+					.setCreateTime(now));
 			return;
 		}
 		UserDO userDO = userService.findById(licenseDO.getUserId());
 		if (null == userDO || EnableStatusEnum.DISABLE.getStatus().equals(userDO.getEnable())) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license无效!", licenseKey));
+			clientConnectRecordService.add(new ClientConnectRecordDO()
+					.setIp(ip)
+					.setLicenseId(licenseDO.getId())
+					.setType(ClientConnectTypeEnum.CONNECT.getType())
+					.setMsg(licenseKey)
+					.setCode(SuccessCodeEnum.FAIL.getCode())
+					.setErr("当前license无效!")
+					.setCreateTime(now));
 			return;
 		}
 		Channel cmdChannel = ProxyUtil.getCmdChannelByLicenseId(licenseDO.getId());
 		if (null != cmdChannel) {
 			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "当前license已被另一节点使用!", licenseKey));
+			clientConnectRecordService.add(new ClientConnectRecordDO()
+					.setIp(ip)
+					.setLicenseId(licenseDO.getId())
+					.setType(ClientConnectTypeEnum.CONNECT.getType())
+					.setMsg(licenseKey)
+					.setCode(SuccessCodeEnum.FAIL.getCode())
+					.setErr("当前license已被另一节点使用!")
+					.setCreateTime(now));
 			return;
 		}
 		// 发送认证成功消息
 		ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.SUCCESS.getCode(), "认证成功!", licenseKey));
 
+		clientConnectRecordService.add(new ClientConnectRecordDO()
+				.setIp(ip)
+				.setLicenseId(licenseDO.getId())
+				.setType(ClientConnectTypeEnum.CONNECT.getType())
+				.setMsg(licenseKey)
+				.setCode(SuccessCodeEnum.SUCCESS.getCode())
+				.setCreateTime(now));
+
 		List<PortMappingDO> portMappingList = portMappingService.findEnableListByLicenseId(licenseDO.getId());
 		// 没有端口映射仍然保持连接
 		if (!CollectionUtil.isEmpty(portMappingList)) {
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java
new file mode 100644
index 00000000..83b75878
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.service;
+
+import fun.asgc.neutrino.core.annotation.Autowired;
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.proxy.server.dal.ClientConnectRecordMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/23
+ */
+@Slf4j
+@NonIntercept
+@Component
+public class ClientConnectRecordService {
+    @Autowired
+    private ClientConnectRecordMapper clientConnectRecordMapper;
+
+    public void add(ClientConnectRecordDO clientConnectRecordDO) {
+        clientConnectRecordMapper.add(clientConnectRecordDO);
+    }
+}
diff --git a/neutrino-proxy-server/src/main/resources/mapper/ClientConnectRecordMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/ClientConnectRecordMapper.xml
new file mode 100644
index 00000000..c6b22539
--- /dev/null
+++ b/neutrino-proxy-server/src/main/resources/mapper/ClientConnectRecordMapper.xml
@@ -0,0 +1,7 @@
+<mapper namespace = "fun.asgc.neutrino.proxy.server.dal.ClientConnectRecordMapper">
+
+    <update id="add">
+        insert into client_connect_record(`ip`,`license_id`,`type`, `msg`, `code`, `err`, `create_time`)
+        values(:ip,:licenseId,:type,:msg,:code,:err,:createTime)
+    </update>
+</mapper>
diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
index 406f7884..759ea1cb 100644
--- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
@@ -75,10 +75,8 @@ CREATE TABLE IF NOT EXISTS `user_login_record` (
 #客户端连接记录表
 CREATE TABLE IF NOT EXISTS `client_connect_record` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    `user_id` INTEGER NOT NULL,
     `ip` VARCHAR(50) NOT NULL,
-    `license_id` INTEGER(20) NOT NULL,
-    `license_key` VARCHAR(100) NOT NULL,
+    `license_id` INTEGER(20) DEFAULT NULL,
     `type` INTEGER(2) NOT NULL,
     `msg` VARCHAR(512) DEFAULT NULL,
     `code` INTEGER(2) NOT NULL,

From 507d4ebb0425bfee22975c9060625c67b9e6f9d0 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 14:08:02 +0800
Subject: [PATCH 50/55] =?UTF-8?q?license=E3=80=81=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrino/proxy/server/dal/LicenseMapper.java    |  3 +++
 .../proxy/server/dal/PortMappingMapper.java         |  3 +++
 .../proxy/server/service/LicenseService.java        | 13 ++++++++++---
 .../proxy/server/service/PortMappingService.java    | 13 ++++++++++---
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java
index f24dc5b8..d2547af7 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java
@@ -74,6 +74,9 @@ public interface LicenseMapper extends SqlMapper {
 	@Update("update `license` set is_online = :isOnline, update_time = :updateTime where id = :id")
 	void updateOnlineStatus(@Param("id") Integer id, @Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime);
 
+	@Update("update `license` set is_online = :isOnline, update_time = :updateTime")
+	void updateOnlineStatus(@Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime);
+
 	@Update("update `license` set key = :key,update_time = :updateTime where id = :id")
 	void reset(@Param("id") Integer id, @Param("key") String key, @Param("updateTime") Date updateTime);
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java
index 97245a7d..da2714ad 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java
@@ -79,4 +79,7 @@ public interface PortMappingMapper extends SqlMapper {
 
 	@Update("update `port_mapping` set is_online = :isOnline,update_time = :updateTime where license_id = :licenseId")
 	void updateOnlineStatus(@Param("licenseId") Integer licenseId, @Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime);
+
+	@Update("update `port_mapping` set is_online = :isOnline,update_time = :updateTime")
+	void updateOnlineStatus(@Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
index 4da7fe49..20eaaee3 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
@@ -22,9 +22,7 @@
 package fun.asgc.neutrino.proxy.server.service;
 
 import com.google.common.collect.Sets;
-import fun.asgc.neutrino.core.annotation.Autowired;
-import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.annotation.*;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.core.util.CollectionUtil;
@@ -202,4 +200,13 @@ public class LicenseService {
 		}
 		return licenseKey.substring(0, 10) + "****" + licenseKey.substring(licenseKey.length() - 10);
 	}
+
+	/**
+	 * 服务端项目停止、启动时，更新在线状态为离线
+	 */
+	@Init
+	@Destroy
+	public void destroy() {
+		licenseMapper.updateOnlineStatus(OnlineStatusEnum.OFFLINE.getStatus(), new Date());
+	}
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
index fea4edce..15adbeb1 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
@@ -22,9 +22,7 @@
 package fun.asgc.neutrino.proxy.server.service;
 
 import com.google.common.collect.Sets;
-import fun.asgc.neutrino.core.annotation.Autowired;
-import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.annotation.*;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.core.util.CollectionUtil;
@@ -220,4 +218,13 @@ public class PortMappingService {
 		return portMappingMapper.findEnableListByLicenseId(licenseId);
 	}
 
+	/**
+	 * 服务端项目停止、启动时，更新在线状态为离线
+	 */
+	@Init
+	@Destroy
+	public void destroy() {
+		portMappingMapper.updateOnlineStatus(OnlineStatusEnum.OFFLINE.getStatus(), new Date());
+	}
+
 }

From 96648ea7bc1f363581f342df8d979589052b8462 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 14:24:28 +0800
Subject: [PATCH 51/55] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C=E6=A2=B3?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/controller/ReportController.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java
index b69e0c26..6eda243f 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java
@@ -37,6 +37,19 @@ import fun.asgc.neutrino.proxy.server.controller.res.ReportDataViewRes;
 @RestController
 public class ReportController {
 
+    /**
+     * 数据一览：
+     * 在线用户数 查询token有效的用户ID数
+     * 在线Client数 查询license表，状态为在线的数量
+     * 今日流量 上行/下行/总计
+     * 历史流量 上行/下行/总计
+     *
+     * 1、点击在线用户数：下方展示在线的用户列表，带分页
+     * 2、点击在线client数：下方展示在线的license列表，带分页
+     * 3、点击今日流量：下方展示今日的流量折线图（小时）。 筛选项：全部/用户列表
+     * 4、点击历史流量：下方展示历史流量折线图。筛选项：日/月 日期选择：日（展示最近30天，最多跨30日），月（展示最近12个月，最多跨12个月）
+     * @return
+     */
     @GetMapping("data-view")
     public ReportDataViewRes dataView() {
         return new ReportDataViewRes()

From a22791901729af03df037089567de7d0a60a8341 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 15:20:05 +0800
Subject: [PATCH 52/55] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/db/crisp/session/ResultContext.java  | 36 +++++++++++++++++++
 .../core/db/crisp/session/ResultHandler.java  | 30 ++++++++++++++++
 .../core/db/crisp/session/SqlSession.java     | 10 +++---
 3 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/ResultContext.java
 create mode 100644 neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/ResultHandler.java

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/ResultContext.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/ResultContext.java
new file mode 100644
index 00000000..4448e05d
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/ResultContext.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp.session;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/23
+ */
+public interface ResultContext<T> {
+    T getResultObject();
+
+    int getResultCount();
+
+    boolean isStopped();
+
+    void stop();
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/ResultHandler.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/ResultHandler.java
new file mode 100644
index 00000000..027c9108
--- /dev/null
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/ResultHandler.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.core.db.crisp.session;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/11/23
+ */
+public interface ResultHandler<T> {
+    void handleResult(ResultContext<? extends T> resultContext);
+}
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSession.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSession.java
index 6f2fd629..6633f51c 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSession.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/crisp/session/SqlSession.java
@@ -21,10 +21,9 @@
  */
 package fun.asgc.neutrino.core.db.crisp.session;
 
-import fun.asgc.neutrino.core.db.crisp.base.BatchResult;
 import fun.asgc.neutrino.core.db.crisp.DbConfig;
+import fun.asgc.neutrino.core.db.crisp.base.BatchResult;
 import fun.asgc.neutrino.core.db.crisp.base.RowBounds;
-import sun.plugin2.main.server.ResultHandler;
 
 import java.io.Closeable;
 import java.sql.Connection;
@@ -125,11 +124,14 @@ public interface SqlSession extends Closeable {
     /**
      * Retrieve a single row mapped from the statement key and parameter
      * using a {@code ResultHandler}.
+     *
      * @param statement Unique identifier matching the statement to use.
      * @param parameter A parameter object to pass to the statement.
-     * @param handler ResultHandler that will handle each retrieved row
+     * @param handler   ResultHandler that will handle each retrieved row
      */
-    void select(String statement, Object parameter, ResultHandler handler);
+    default void select(String statement, Object parameter, ResultHandler handler) {
+
+    }
 
     /**
      * Retrieve a single row mapped from the statement

From 60b1dec9b278baf316ee10d266d894bce7a462b4 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 18:11:06 +0800
Subject: [PATCH 53/55] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/fun/asgc/neutrino/core/web/HttpRequestHandler.java    | 3 +--
 neutrino-proxy-server/src/main/resources/application.yml       | 2 +-
 neutrino-proxy-server/src/main/resources/logback.xml           | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java
index 2d2e0b6f..a158b244 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/HttpRequestHandler.java
@@ -43,7 +43,6 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpHeaderValues;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import lombok.extern.slf4j.Slf4j;
 
@@ -115,7 +114,7 @@ public class HttpRequestHandler {
 
 				HttpResponseWrapper httpResponseWrapper = HttpContextHolder.getHttpResponseWrapper();
 				httpResponseWrapper.setContent(Unpooled.wrappedBuffer(res.getBytes()));
-				httpResponseWrapper.headers().add(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.APPLICATION_JSON);
+				httpResponseWrapper.headers().add(HttpHeaderNames.CONTENT_TYPE, "application/json;charset=UTF-8");
 				httpResponseWrapper.writeAndFlush();
 				return;
 			} else if(HttpRouterType.PAGE == httpRouteResult.getType()) {
diff --git a/neutrino-proxy-server/src/main/resources/application.yml b/neutrino-proxy-server/src/main/resources/application.yml
index f767f813..603a7fdb 100644
--- a/neutrino-proxy-server/src/main/resources/application.yml
+++ b/neutrino-proxy-server/src/main/resources/application.yml
@@ -3,7 +3,7 @@ neutrino:
     name: neutrino-proxy-server
   http:
     enable: true
-    port: 8080
+    port: 8888
     context-path: /
     max-content-length-desc: 128K
     static-resource:
diff --git a/neutrino-proxy-server/src/main/resources/logback.xml b/neutrino-proxy-server/src/main/resources/logback.xml
index 7b864774..af3bdb73 100644
--- a/neutrino-proxy-server/src/main/resources/logback.xml
+++ b/neutrino-proxy-server/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <property name="LOG_FILE" value="/work/project/neutrino-proxy/server.log"/>
+    <property name="LOG_FILE" value="/work/projects/neutrino-proxy/server.log"/>
     <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n"/>
     <property name="ENCODE" value="utf8" />
 

From aacec48ad6b7a1ae72a4b3bfe3323feea1cd8fa8 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 18:27:16 +0800
Subject: [PATCH 54/55] =?UTF-8?q?=E6=9B=B4=E6=96=B0README.MD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                              | 16 ++++++++++------
 neutrino-proxy-admin/config/dev.env.js |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 106ee7f3..8a389016 100644
--- a/README.md
+++ b/README.md
@@ -99,21 +99,25 @@ proxy:
 默认情况下，客户端会加载当前目录下的.neutrino-proxy.license里的license，可通过命令行参数指定，如：java -jar neutrino-proxy-client.jar license=xxx
 若启动参数未指定license，且是首次启动（当前目录下未缓存license），则需要根据命令行提示输入正确的license, 输入完成后完成连接，可在服务端管理页面控制端口转发，参见[2、运行示例](#2)
 
-# 6、未来迭代方向
+# 6、演示环境
+> 可适用分配好的游客license试用。服务器带宽较低，仅供学习使用，大家手下留情！
+- 管理后台地址：http://103.163.47.16:8888
+- 游客账号：visitor/123456
+
+# 7、未来迭代方向
 - 优化代码、增强稳定性
 - 服务端增加管理页面，提供报表、授权、限流等功能
 - 从项目中分离、孵化出另一个开源项目(neutrino-framework)
 
-# 7、技术文档
+# 8、技术文档
 - [Aop](./docs/Aop.MD)
 - [Channel](./docs/Channel.MD)
 
-# 8、联系我们
+# 9、联系我们
 - 微信: yuyunshize
-- Gitee(主更): https://gitee.com/asgc/neutrino-proxy
-- Github: https://github.com/aoshiguchen/neutrino-proxy
+- Gitee: https://gitee.com/asgc/neutrino-proxy
 
-# 9、特别鸣谢
+# 10、特别鸣谢
 * [JetBrains](https://www.jetbrains.com?from=RedisFront)
 
 ![JenBrains logo](assets/jetbrains.svg)
\ No newline at end of file
diff --git a/neutrino-proxy-admin/config/dev.env.js b/neutrino-proxy-admin/config/dev.env.js
index e89dfbb0..f812fea4 100644
--- a/neutrino-proxy-admin/config/dev.env.js
+++ b/neutrino-proxy-admin/config/dev.env.js
@@ -1,5 +1,5 @@
 module.exports = {
 	NODE_ENV: '"development"',
 	ENV_CONFIG: '"dev"',
-	BASE_API: '"http://localhost:8080"'
+	BASE_API: '"http://103.163.47.16:8888"'
 }

From ae345a6161c3d17517994991ba65d7105091edd1 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 23 Nov 2022 18:27:59 +0800
Subject: [PATCH 55/55] =?UTF-8?q?=E6=9B=B4=E6=96=B0README.MD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/config/dev.env.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-admin/config/dev.env.js b/neutrino-proxy-admin/config/dev.env.js
index f812fea4..f5ee615e 100644
--- a/neutrino-proxy-admin/config/dev.env.js
+++ b/neutrino-proxy-admin/config/dev.env.js
@@ -1,5 +1,5 @@
 module.exports = {
 	NODE_ENV: '"development"',
 	ENV_CONFIG: '"dev"',
-	BASE_API: '"http://103.163.47.16:8888"'
+	BASE_API: '"http://localhost:8888"'
 }