From 2c010f9321b3a201b8f0ce10f546046578d84867 Mon Sep 17 00:00:00 2001 From: qaiu <736226400@qq.com> Date: Fri, 21 Apr 2023 01:21:56 +0800 Subject: [PATCH] init --- .../{com/yhinfo => qaiu/vx}/core/Deploy.java | 12 +- .../vx}/core/annotaions/DateFormat.java | 2 +- .../vx}/core/annotaions/RouteHandler.java | 2 +- .../vx}/core/annotaions/RouteMapping.java | 6 +- .../vx}/core/annotaions/Service.java | 2 +- .../vx}/core/annotaions/SockRouteMapper.java | 2 +- .../vx}/core/base/BaseAsyncService.java | 6 +- .../vx}/core/base/BaseHttpApi.java | 2 +- .../vx}/core/enums/MIMEType.java | 2 +- .../vx}/core/enums/RouteMethod.java | 2 +- .../handlerfactory/RouterHandlerFactory.java | 18 +-- .../vx}/core/interceptor/Interceptor.java | 2 +- .../vx}/core/model/JsonResult.java | 2 +- .../vx}/core/util/AsyncServiceUtil.java | 2 +- .../vx}/core/util/CastUtil.java | 4 +- .../vx}/core/util/CommonUtil.java | 2 +- .../vx}/core/util/ConfigUtil.java | 2 +- .../vx}/core/util/LocalConstant.java | 2 +- .../vx}/core/util/ParamUtil.java | 2 +- .../vx}/core/util/ReflectionUtil.java | 2 +- .../vx}/core/util/SharedDataUtil.java | 2 +- .../vx}/core/util/SnowflakeIdWorker.java | 2 +- .../vx}/core/util/StringCase.java | 4 +- .../vx}/core/util/VertxHolder.java | 2 +- .../core/verticle/ReverseProxyVerticle.java | 10 +- .../vx}/core/verticle/RouterVerticle.java | 11 +- .../vx}/core/verticle/ServiceVerticle.java | 12 +- web/pom.xml | 2 +- .../common/model/MyDataParametersMapper.java | 28 ---- .../real/common/model/MyDataRowMapper.java | 29 ---- .../model/UserInfoParametersMapper.java | 30 ---- .../real/common/model/UserInfoRowMapper.java | 35 ----- .../web/service/DbServiceVertxEBProxy.java | 89 ----------- .../service/DbServiceVertxProxyHandler.java | 140 ------------------ .../web/service/UserServiceVertxEBProxy.java | 76 ---------- .../service/UserServiceVertxProxyHandler.java | 135 ----------------- .../java/cn/com/yhinfo/real/package-info.java | 10 -- .../{com/yhinfo/real => qaiu/lz}/AppMain.java | 4 +- .../real => qaiu/lz}/common/ToJson.java | 2 +- .../interceptorImpl/DefaultInterceptor.java | 14 +- .../real => qaiu/lz}/common/model/MyData.java | 2 +- .../lz}/common/model/UserInfo.java | 4 +- .../lz}/common/util/ArrayUtil.java | 2 +- .../lz}/common/util/ConnectUtil.java | 2 +- .../main/java/cn/qaiu/lz/package-info.java | 10 ++ .../real => qaiu/lz}/web/http/ServerApi.java | 24 +-- .../real => qaiu/lz}/web/model/RealUser.java | 4 +- .../lz}/web/service/DbService.java | 6 +- .../lz}/web/service/JdkProxyFactory.java | 6 +- .../lz}/web/service/ServiceJdkProxy.java | 2 +- .../lz}/web/service/UserService.java | 6 +- .../lz}/web/service/impl/DbServiceImpl.java | 10 +- .../lz}/web/service/impl/UserServiceImpl.java | 8 +- web/src/main/resources/app-dev.yml | 9 +- .../yhinfo => qaiu/web}/test/StompTest.java | 2 +- .../{com/yhinfo => qaiu/web}/test/Test01.java | 2 +- .../{com/yhinfo => qaiu/web}/test/Test02.java | 4 +- .../{com/yhinfo => qaiu/web}/test/TestOS.java | 4 +- .../web}/test/WebProxyExamples.java | 2 +- 59 files changed, 128 insertions(+), 694 deletions(-) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/Deploy.java (95%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/annotaions/DateFormat.java (91%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/annotaions/RouteHandler.java (91%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/annotaions/RouteMapping.java (85%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/annotaions/Service.java (91%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/annotaions/SockRouteMapper.java (88%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/base/BaseAsyncService.java (94%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/base/BaseHttpApi.java (96%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/enums/MIMEType.java (96%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/enums/RouteMethod.java (87%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/handlerfactory/RouterHandlerFactory.java (97%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/interceptor/Interceptor.java (89%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/model/JsonResult.java (99%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/AsyncServiceUtil.java (94%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/CastUtil.java (90%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/CommonUtil.java (99%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/ConfigUtil.java (98%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/LocalConstant.java (96%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/ParamUtil.java (97%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/ReflectionUtil.java (99%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/SharedDataUtil.java (98%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/SnowflakeIdWorker.java (99%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/StringCase.java (99%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/util/VertxHolder.java (94%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/verticle/ReverseProxyVerticle.java (97%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/verticle/RouterVerticle.java (87%) rename core/src/main/java/cn/{com/yhinfo => qaiu/vx}/core/verticle/ServiceVerticle.java (87%) delete mode 100644 web/src/main/generated/cn/com/yhinfo/real/common/model/MyDataParametersMapper.java delete mode 100644 web/src/main/generated/cn/com/yhinfo/real/common/model/MyDataRowMapper.java delete mode 100644 web/src/main/generated/cn/com/yhinfo/real/common/model/UserInfoParametersMapper.java delete mode 100644 web/src/main/generated/cn/com/yhinfo/real/common/model/UserInfoRowMapper.java delete mode 100644 web/src/main/generated/cn/com/yhinfo/real/web/service/DbServiceVertxEBProxy.java delete mode 100644 web/src/main/generated/cn/com/yhinfo/real/web/service/DbServiceVertxProxyHandler.java delete mode 100644 web/src/main/generated/cn/com/yhinfo/real/web/service/UserServiceVertxEBProxy.java delete mode 100644 web/src/main/generated/cn/com/yhinfo/real/web/service/UserServiceVertxProxyHandler.java delete mode 100644 web/src/main/java/cn/com/yhinfo/real/package-info.java rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/AppMain.java (87%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/common/ToJson.java (91%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/common/interceptorImpl/DefaultInterceptor.java (78%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/common/model/MyData.java (94%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/common/model/UserInfo.java (92%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/common/util/ArrayUtil.java (92%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/common/util/ConnectUtil.java (87%) create mode 100644 web/src/main/java/cn/qaiu/lz/package-info.java rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/web/http/ServerApi.java (79%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/web/model/RealUser.java (85%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/web/service/DbService.java (74%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/web/service/JdkProxyFactory.java (81%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/web/service/ServiceJdkProxy.java (94%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/web/service/UserService.java (68%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/web/service/impl/DbServiceImpl.java (80%) rename web/src/main/java/cn/{com/yhinfo/real => qaiu/lz}/web/service/impl/UserServiceImpl.java (63%) rename web/src/test/java/cn/{com/yhinfo => qaiu/web}/test/StompTest.java (97%) rename web/src/test/java/cn/{com/yhinfo => qaiu/web}/test/Test01.java (99%) rename web/src/test/java/cn/{com/yhinfo => qaiu/web}/test/Test02.java (98%) rename web/src/test/java/cn/{com/yhinfo => qaiu/web}/test/TestOS.java (99%) rename web/src/test/java/cn/{com/yhinfo => qaiu/web}/test/WebProxyExamples.java (99%) diff --git a/core/src/main/java/cn/com/yhinfo/core/Deploy.java b/core/src/main/java/cn/qaiu/vx/core/Deploy.java similarity index 95% rename from core/src/main/java/cn/com/yhinfo/core/Deploy.java rename to core/src/main/java/cn/qaiu/vx/core/Deploy.java index eb0ce52..52690b8 100644 --- a/core/src/main/java/cn/com/yhinfo/core/Deploy.java +++ b/core/src/main/java/cn/qaiu/vx/core/Deploy.java @@ -1,10 +1,10 @@ -package cn.com.yhinfo.core; +package cn.qaiu.vx.core; -import cn.com.yhinfo.core.util.ConfigUtil; -import cn.com.yhinfo.core.util.VertxHolder; -import cn.com.yhinfo.core.verticle.ReverseProxyVerticle; -import cn.com.yhinfo.core.verticle.ServiceVerticle; -import cn.com.yhinfo.core.verticle.RouterVerticle; +import cn.qaiu.vx.core.util.ConfigUtil; +import cn.qaiu.vx.core.util.VertxHolder; +import cn.qaiu.vx.core.verticle.ReverseProxyVerticle; +import cn.qaiu.vx.core.verticle.ServiceVerticle; +import cn.qaiu.vx.core.verticle.RouterVerticle; import io.vertx.core.*; import io.vertx.core.json.JsonObject; import io.vertx.core.shareddata.LocalMap; diff --git a/core/src/main/java/cn/com/yhinfo/core/annotaions/DateFormat.java b/core/src/main/java/cn/qaiu/vx/core/annotaions/DateFormat.java similarity index 91% rename from core/src/main/java/cn/com/yhinfo/core/annotaions/DateFormat.java rename to core/src/main/java/cn/qaiu/vx/core/annotaions/DateFormat.java index b7e67f1..3daa603 100644 --- a/core/src/main/java/cn/com/yhinfo/core/annotaions/DateFormat.java +++ b/core/src/main/java/cn/qaiu/vx/core/annotaions/DateFormat.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.annotaions; +package cn.qaiu.vx.core.annotaions; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/cn/com/yhinfo/core/annotaions/RouteHandler.java b/core/src/main/java/cn/qaiu/vx/core/annotaions/RouteHandler.java similarity index 91% rename from core/src/main/java/cn/com/yhinfo/core/annotaions/RouteHandler.java rename to core/src/main/java/cn/qaiu/vx/core/annotaions/RouteHandler.java index e1e555a..9ae86fc 100644 --- a/core/src/main/java/cn/com/yhinfo/core/annotaions/RouteHandler.java +++ b/core/src/main/java/cn/qaiu/vx/core/annotaions/RouteHandler.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.annotaions; +package cn.qaiu.vx.core.annotaions; import java.lang.annotation.*; diff --git a/core/src/main/java/cn/com/yhinfo/core/annotaions/RouteMapping.java b/core/src/main/java/cn/qaiu/vx/core/annotaions/RouteMapping.java similarity index 85% rename from core/src/main/java/cn/com/yhinfo/core/annotaions/RouteMapping.java rename to core/src/main/java/cn/qaiu/vx/core/annotaions/RouteMapping.java index 97bb762..ac6a2b5 100644 --- a/core/src/main/java/cn/com/yhinfo/core/annotaions/RouteMapping.java +++ b/core/src/main/java/cn/qaiu/vx/core/annotaions/RouteMapping.java @@ -1,7 +1,7 @@ -package cn.com.yhinfo.core.annotaions; +package cn.qaiu.vx.core.annotaions; -import cn.com.yhinfo.core.enums.MIMEType; -import cn.com.yhinfo.core.enums.RouteMethod; +import cn.qaiu.vx.core.enums.MIMEType; +import cn.qaiu.vx.core.enums.RouteMethod; import java.lang.annotation.*; diff --git a/core/src/main/java/cn/com/yhinfo/core/annotaions/Service.java b/core/src/main/java/cn/qaiu/vx/core/annotaions/Service.java similarity index 91% rename from core/src/main/java/cn/com/yhinfo/core/annotaions/Service.java rename to core/src/main/java/cn/qaiu/vx/core/annotaions/Service.java index 4b2e396..847cfef 100644 --- a/core/src/main/java/cn/com/yhinfo/core/annotaions/Service.java +++ b/core/src/main/java/cn/qaiu/vx/core/annotaions/Service.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.annotaions; +package cn.qaiu.vx.core.annotaions; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/cn/com/yhinfo/core/annotaions/SockRouteMapper.java b/core/src/main/java/cn/qaiu/vx/core/annotaions/SockRouteMapper.java similarity index 88% rename from core/src/main/java/cn/com/yhinfo/core/annotaions/SockRouteMapper.java rename to core/src/main/java/cn/qaiu/vx/core/annotaions/SockRouteMapper.java index 7665c2e..de1be77 100644 --- a/core/src/main/java/cn/com/yhinfo/core/annotaions/SockRouteMapper.java +++ b/core/src/main/java/cn/qaiu/vx/core/annotaions/SockRouteMapper.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.annotaions; +package cn.qaiu.vx.core.annotaions; import java.lang.annotation.*; diff --git a/core/src/main/java/cn/com/yhinfo/core/base/BaseAsyncService.java b/core/src/main/java/cn/qaiu/vx/core/base/BaseAsyncService.java similarity index 94% rename from core/src/main/java/cn/com/yhinfo/core/base/BaseAsyncService.java rename to core/src/main/java/cn/qaiu/vx/core/base/BaseAsyncService.java index 1376398..5f5c73f 100644 --- a/core/src/main/java/cn/com/yhinfo/core/base/BaseAsyncService.java +++ b/core/src/main/java/cn/qaiu/vx/core/base/BaseAsyncService.java @@ -1,6 +1,6 @@ -package cn.com.yhinfo.core.base; +package cn.qaiu.vx.core.base; -import cn.com.yhinfo.core.util.CastUtil; +import cn.qaiu.vx.core.util.CastUtil; import java.util.Arrays; @@ -36,4 +36,4 @@ public interface BaseAsyncService { } return clazz; } -} \ No newline at end of file +} diff --git a/core/src/main/java/cn/com/yhinfo/core/base/BaseHttpApi.java b/core/src/main/java/cn/qaiu/vx/core/base/BaseHttpApi.java similarity index 96% rename from core/src/main/java/cn/com/yhinfo/core/base/BaseHttpApi.java rename to core/src/main/java/cn/qaiu/vx/core/base/BaseHttpApi.java index b3f47a5..6de5ad0 100644 --- a/core/src/main/java/cn/com/yhinfo/core/base/BaseHttpApi.java +++ b/core/src/main/java/cn/qaiu/vx/core/base/BaseHttpApi.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.base; +package cn.qaiu.vx.core.base; import io.vertx.core.json.JsonObject; import io.vertx.ext.web.RoutingContext; diff --git a/core/src/main/java/cn/com/yhinfo/core/enums/MIMEType.java b/core/src/main/java/cn/qaiu/vx/core/enums/MIMEType.java similarity index 96% rename from core/src/main/java/cn/com/yhinfo/core/enums/MIMEType.java rename to core/src/main/java/cn/qaiu/vx/core/enums/MIMEType.java index b480ac9..4b11341 100644 --- a/core/src/main/java/cn/com/yhinfo/core/enums/MIMEType.java +++ b/core/src/main/java/cn/qaiu/vx/core/enums/MIMEType.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.enums; +package cn.qaiu.vx.core.enums; /** * MIMEType: request or response head diff --git a/core/src/main/java/cn/com/yhinfo/core/enums/RouteMethod.java b/core/src/main/java/cn/qaiu/vx/core/enums/RouteMethod.java similarity index 87% rename from core/src/main/java/cn/com/yhinfo/core/enums/RouteMethod.java rename to core/src/main/java/cn/qaiu/vx/core/enums/RouteMethod.java index fc34d62..f0a7d20 100644 --- a/core/src/main/java/cn/com/yhinfo/core/enums/RouteMethod.java +++ b/core/src/main/java/cn/qaiu/vx/core/enums/RouteMethod.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.enums; +package cn.qaiu.vx.core.enums; /** * Router API 请求处理方式枚举 diff --git a/core/src/main/java/cn/com/yhinfo/core/handlerfactory/RouterHandlerFactory.java b/core/src/main/java/cn/qaiu/vx/core/handlerfactory/RouterHandlerFactory.java similarity index 97% rename from core/src/main/java/cn/com/yhinfo/core/handlerfactory/RouterHandlerFactory.java rename to core/src/main/java/cn/qaiu/vx/core/handlerfactory/RouterHandlerFactory.java index 8b888a9..e491707 100644 --- a/core/src/main/java/cn/com/yhinfo/core/handlerfactory/RouterHandlerFactory.java +++ b/core/src/main/java/cn/qaiu/vx/core/handlerfactory/RouterHandlerFactory.java @@ -1,13 +1,13 @@ -package cn.com.yhinfo.core.handlerfactory; +package cn.qaiu.vx.core.handlerfactory; -import cn.com.yhinfo.core.annotaions.DateFormat; -import cn.com.yhinfo.core.annotaions.RouteHandler; -import cn.com.yhinfo.core.annotaions.RouteMapping; -import cn.com.yhinfo.core.annotaions.SockRouteMapper; -import cn.com.yhinfo.core.base.BaseHttpApi; -import cn.com.yhinfo.core.enums.MIMEType; -import cn.com.yhinfo.core.model.JsonResult; -import cn.com.yhinfo.core.util.*; +import cn.qaiu.vx.core.annotaions.DateFormat; +import cn.qaiu.vx.core.annotaions.RouteHandler; +import cn.qaiu.vx.core.annotaions.RouteMapping; +import cn.qaiu.vx.core.annotaions.SockRouteMapper; +import cn.qaiu.vx.core.enums.MIMEType; +import cn.qaiu.vx.core.model.JsonResult; +import cn.qaiu.vx.core.base.BaseHttpApi; +import cn.qaiu.vx.core.util.*; import io.vertx.core.Future; import io.vertx.core.Handler; import io.vertx.core.MultiMap; diff --git a/core/src/main/java/cn/com/yhinfo/core/interceptor/Interceptor.java b/core/src/main/java/cn/qaiu/vx/core/interceptor/Interceptor.java similarity index 89% rename from core/src/main/java/cn/com/yhinfo/core/interceptor/Interceptor.java rename to core/src/main/java/cn/qaiu/vx/core/interceptor/Interceptor.java index c5b327f..626f1b2 100644 --- a/core/src/main/java/cn/com/yhinfo/core/interceptor/Interceptor.java +++ b/core/src/main/java/cn/qaiu/vx/core/interceptor/Interceptor.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.interceptor; +package cn.qaiu.vx.core.interceptor; import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; diff --git a/core/src/main/java/cn/com/yhinfo/core/model/JsonResult.java b/core/src/main/java/cn/qaiu/vx/core/model/JsonResult.java similarity index 99% rename from core/src/main/java/cn/com/yhinfo/core/model/JsonResult.java rename to core/src/main/java/cn/qaiu/vx/core/model/JsonResult.java index 0f32879..a4be124 100644 --- a/core/src/main/java/cn/com/yhinfo/core/model/JsonResult.java +++ b/core/src/main/java/cn/qaiu/vx/core/model/JsonResult.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.model; +package cn.qaiu.vx.core.model; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/cn/com/yhinfo/core/util/AsyncServiceUtil.java b/core/src/main/java/cn/qaiu/vx/core/util/AsyncServiceUtil.java similarity index 94% rename from core/src/main/java/cn/com/yhinfo/core/util/AsyncServiceUtil.java rename to core/src/main/java/cn/qaiu/vx/core/util/AsyncServiceUtil.java index 3bcb476..42572d3 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/AsyncServiceUtil.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/AsyncServiceUtil.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; import io.vertx.core.Vertx; import io.vertx.serviceproxy.ServiceProxyBuilder; diff --git a/core/src/main/java/cn/com/yhinfo/core/util/CastUtil.java b/core/src/main/java/cn/qaiu/vx/core/util/CastUtil.java similarity index 90% rename from core/src/main/java/cn/com/yhinfo/core/util/CastUtil.java rename to core/src/main/java/cn/qaiu/vx/core/util/CastUtil.java index a87adc0..07331b3 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/CastUtil.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/CastUtil.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; /** * 转换为任意类型 旨在消除泛型转换时的异常 @@ -15,4 +15,4 @@ public interface CastUtil { static T cast(Object object) { return (T) object; } -} \ No newline at end of file +} diff --git a/core/src/main/java/cn/com/yhinfo/core/util/CommonUtil.java b/core/src/main/java/cn/qaiu/vx/core/util/CommonUtil.java similarity index 99% rename from core/src/main/java/cn/com/yhinfo/core/util/CommonUtil.java rename to core/src/main/java/cn/qaiu/vx/core/util/CommonUtil.java index fcf83c6..23bae56 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/CommonUtil.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/CommonUtil.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonObject; diff --git a/core/src/main/java/cn/com/yhinfo/core/util/ConfigUtil.java b/core/src/main/java/cn/qaiu/vx/core/util/ConfigUtil.java similarity index 98% rename from core/src/main/java/cn/com/yhinfo/core/util/ConfigUtil.java rename to core/src/main/java/cn/qaiu/vx/core/util/ConfigUtil.java index 07ef740..43ebb66 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/ConfigUtil.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/ConfigUtil.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; import io.vertx.config.ConfigRetriever; import io.vertx.config.ConfigRetrieverOptions; diff --git a/core/src/main/java/cn/com/yhinfo/core/util/LocalConstant.java b/core/src/main/java/cn/qaiu/vx/core/util/LocalConstant.java similarity index 96% rename from core/src/main/java/cn/com/yhinfo/core/util/LocalConstant.java rename to core/src/main/java/cn/qaiu/vx/core/util/LocalConstant.java index 3fdc70c..0a7fa8c 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/LocalConstant.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/LocalConstant.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/cn/com/yhinfo/core/util/ParamUtil.java b/core/src/main/java/cn/qaiu/vx/core/util/ParamUtil.java similarity index 97% rename from core/src/main/java/cn/com/yhinfo/core/util/ParamUtil.java rename to core/src/main/java/cn/qaiu/vx/core/util/ParamUtil.java index 5cf557f..58bf7a3 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/ParamUtil.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/ParamUtil.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; import io.vertx.core.MultiMap; import org.apache.commons.beanutils.BeanUtils; diff --git a/core/src/main/java/cn/com/yhinfo/core/util/ReflectionUtil.java b/core/src/main/java/cn/qaiu/vx/core/util/ReflectionUtil.java similarity index 99% rename from core/src/main/java/cn/com/yhinfo/core/util/ReflectionUtil.java rename to core/src/main/java/cn/qaiu/vx/core/util/ReflectionUtil.java index 70d0043..43b3e6d 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/ReflectionUtil.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/ReflectionUtil.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; import javassist.*; import javassist.bytecode.AccessFlag; diff --git a/core/src/main/java/cn/com/yhinfo/core/util/SharedDataUtil.java b/core/src/main/java/cn/qaiu/vx/core/util/SharedDataUtil.java similarity index 98% rename from core/src/main/java/cn/com/yhinfo/core/util/SharedDataUtil.java rename to core/src/main/java/cn/qaiu/vx/core/util/SharedDataUtil.java index b9c4714..4d59956 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/SharedDataUtil.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/SharedDataUtil.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/core/src/main/java/cn/com/yhinfo/core/util/SnowflakeIdWorker.java b/core/src/main/java/cn/qaiu/vx/core/util/SnowflakeIdWorker.java similarity index 99% rename from core/src/main/java/cn/com/yhinfo/core/util/SnowflakeIdWorker.java rename to core/src/main/java/cn/qaiu/vx/core/util/SnowflakeIdWorker.java index 876a0ae..577e657 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/SnowflakeIdWorker.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/SnowflakeIdWorker.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/core/src/main/java/cn/com/yhinfo/core/util/StringCase.java b/core/src/main/java/cn/qaiu/vx/core/util/StringCase.java similarity index 99% rename from core/src/main/java/cn/com/yhinfo/core/util/StringCase.java rename to core/src/main/java/cn/qaiu/vx/core/util/StringCase.java index fe82540..fe2ae62 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/StringCase.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/StringCase.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; import org.apache.commons.lang3.StringUtils; @@ -107,4 +107,4 @@ public class StringCase { System.out.println(toUnderlineUpperCase("__my_nameQaiu___")); } -} \ No newline at end of file +} diff --git a/core/src/main/java/cn/com/yhinfo/core/util/VertxHolder.java b/core/src/main/java/cn/qaiu/vx/core/util/VertxHolder.java similarity index 94% rename from core/src/main/java/cn/com/yhinfo/core/util/VertxHolder.java rename to core/src/main/java/cn/qaiu/vx/core/util/VertxHolder.java index 805287e..fad54fb 100644 --- a/core/src/main/java/cn/com/yhinfo/core/util/VertxHolder.java +++ b/core/src/main/java/cn/qaiu/vx/core/util/VertxHolder.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.core.util; +package cn.qaiu.vx.core.util; import io.vertx.core.Vertx; diff --git a/core/src/main/java/cn/com/yhinfo/core/verticle/ReverseProxyVerticle.java b/core/src/main/java/cn/qaiu/vx/core/verticle/ReverseProxyVerticle.java similarity index 97% rename from core/src/main/java/cn/com/yhinfo/core/verticle/ReverseProxyVerticle.java rename to core/src/main/java/cn/qaiu/vx/core/verticle/ReverseProxyVerticle.java index d916f33..b7be725 100644 --- a/core/src/main/java/cn/com/yhinfo/core/verticle/ReverseProxyVerticle.java +++ b/core/src/main/java/cn/qaiu/vx/core/verticle/ReverseProxyVerticle.java @@ -1,9 +1,9 @@ -package cn.com.yhinfo.core.verticle; +package cn.qaiu.vx.core.verticle; -import cn.com.yhinfo.core.util.CastUtil; -import cn.com.yhinfo.core.util.ConfigUtil; -import cn.com.yhinfo.core.util.SharedDataUtil; -import cn.com.yhinfo.core.util.VertxHolder; +import cn.qaiu.vx.core.util.CastUtil; +import cn.qaiu.vx.core.util.ConfigUtil; +import cn.qaiu.vx.core.util.SharedDataUtil; +import cn.qaiu.vx.core.util.VertxHolder; import io.vertx.core.AbstractVerticle; import io.vertx.core.Future; import io.vertx.core.Promise; diff --git a/core/src/main/java/cn/com/yhinfo/core/verticle/RouterVerticle.java b/core/src/main/java/cn/qaiu/vx/core/verticle/RouterVerticle.java similarity index 87% rename from core/src/main/java/cn/com/yhinfo/core/verticle/RouterVerticle.java rename to core/src/main/java/cn/qaiu/vx/core/verticle/RouterVerticle.java index fa6677d..607c7cc 100644 --- a/core/src/main/java/cn/com/yhinfo/core/verticle/RouterVerticle.java +++ b/core/src/main/java/cn/qaiu/vx/core/verticle/RouterVerticle.java @@ -1,16 +1,13 @@ -package cn.com.yhinfo.core.verticle; +package cn.qaiu.vx.core.verticle; -import cn.com.yhinfo.core.handlerfactory.RouterHandlerFactory; -import cn.com.yhinfo.core.util.CommonUtil; -import cn.com.yhinfo.core.util.SharedDataUtil; +import cn.qaiu.vx.core.handlerfactory.RouterHandlerFactory; +import cn.qaiu.vx.core.util.CommonUtil; +import cn.qaiu.vx.core.util.SharedDataUtil; import io.vertx.core.AbstractVerticle; import io.vertx.core.Promise; import io.vertx.core.http.HttpServer; import io.vertx.core.http.HttpServerOptions; import io.vertx.core.json.JsonObject; -import io.vertx.ext.stomp.StompServer; -import io.vertx.ext.stomp.StompServerHandler; -import io.vertx.ext.stomp.StompServerOptions; import io.vertx.ext.web.Router; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/cn/com/yhinfo/core/verticle/ServiceVerticle.java b/core/src/main/java/cn/qaiu/vx/core/verticle/ServiceVerticle.java similarity index 87% rename from core/src/main/java/cn/com/yhinfo/core/verticle/ServiceVerticle.java rename to core/src/main/java/cn/qaiu/vx/core/verticle/ServiceVerticle.java index c91f050..148f0a3 100644 --- a/core/src/main/java/cn/com/yhinfo/core/verticle/ServiceVerticle.java +++ b/core/src/main/java/cn/qaiu/vx/core/verticle/ServiceVerticle.java @@ -1,9 +1,9 @@ -package cn.com.yhinfo.core.verticle; +package cn.qaiu.vx.core.verticle; -import cn.com.yhinfo.core.annotaions.Service; -import cn.com.yhinfo.core.base.BaseAsyncService; -import cn.com.yhinfo.core.util.ReflectionUtil; -import cn.com.yhinfo.core.util.SharedDataUtil; +import cn.qaiu.vx.core.annotaions.Service; +import cn.qaiu.vx.core.base.BaseAsyncService; +import cn.qaiu.vx.core.util.ReflectionUtil; +import cn.qaiu.vx.core.util.SharedDataUtil; import io.vertx.core.AbstractVerticle; import io.vertx.core.Promise; import io.vertx.serviceproxy.ServiceBinder; @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * 服务注册到EventBus *
Create date 2021-05-07 10:26:54 - * + * * @author QAIU */ public class ServiceVerticle extends AbstractVerticle { diff --git a/web/pom.xml b/web/pom.xml index 56de4ab..3824f8d 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -97,7 +97,7 @@ false - cn.com.yhinfo.real.AppMain + cn.qaiu.lz.AppMain diff --git a/web/src/main/generated/cn/com/yhinfo/real/common/model/MyDataParametersMapper.java b/web/src/main/generated/cn/com/yhinfo/real/common/model/MyDataParametersMapper.java deleted file mode 100644 index 476fc94..0000000 --- a/web/src/main/generated/cn/com/yhinfo/real/common/model/MyDataParametersMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.com.yhinfo.real.common.model; - -/** - * Mapper for {@link MyData}. - * NOTE: This class has been automatically generated from the {@link MyData} original class using Vert.x codegen. - */ -@io.vertx.codegen.annotations.VertxGen -public interface MyDataParametersMapper extends io.vertx.sqlclient.templates.TupleMapper { - - MyDataParametersMapper INSTANCE = new MyDataParametersMapper() {}; - - default io.vertx.sqlclient.Tuple map(java.util.function.Function mapping, int size, MyData params) { - java.util.Map args = map(params); - Object[] array = new Object[size]; - for (int i = 0;i < array.length;i++) { - String column = mapping.apply(i); - array[i] = args.get(column); - } - return io.vertx.sqlclient.Tuple.wrap(array); - } - - default java.util.Map map(MyData obj) { - java.util.Map params = new java.util.HashMap<>(); - params.put("id", obj.getId()); - params.put("max_size", obj.getMaxSize()); - return params; - } -} diff --git a/web/src/main/generated/cn/com/yhinfo/real/common/model/MyDataRowMapper.java b/web/src/main/generated/cn/com/yhinfo/real/common/model/MyDataRowMapper.java deleted file mode 100644 index 82486ee..0000000 --- a/web/src/main/generated/cn/com/yhinfo/real/common/model/MyDataRowMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.com.yhinfo.real.common.model; - -/** - * Mapper for {@link MyData}. - * NOTE: This class has been automatically generated from the {@link MyData} original class using Vert.x codegen. - */ -@io.vertx.codegen.annotations.VertxGen -public interface MyDataRowMapper extends io.vertx.sqlclient.templates.RowMapper { - - @io.vertx.codegen.annotations.GenIgnore - MyDataRowMapper INSTANCE = new MyDataRowMapper() { }; - - @io.vertx.codegen.annotations.GenIgnore - java.util.stream.Collector> COLLECTOR = java.util.stream.Collectors.mapping(INSTANCE::map, java.util.stream.Collectors.toList()); - - @io.vertx.codegen.annotations.GenIgnore - default MyData map(io.vertx.sqlclient.Row row) { - MyData obj = new MyData(); - Object val; - int idx; - if ((idx = row.getColumnIndex("id")) != -1 && (val = row.getString(idx)) != null) { - obj.setId((java.lang.String)val); - } - if ((idx = row.getColumnIndex("max_size")) != -1 && (val = row.getString(idx)) != null) { - obj.setMaxSize((java.lang.String)val); - } - return obj; - } -} diff --git a/web/src/main/generated/cn/com/yhinfo/real/common/model/UserInfoParametersMapper.java b/web/src/main/generated/cn/com/yhinfo/real/common/model/UserInfoParametersMapper.java deleted file mode 100644 index 73f2e70..0000000 --- a/web/src/main/generated/cn/com/yhinfo/real/common/model/UserInfoParametersMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.com.yhinfo.real.common.model; - -/** - * Mapper for {@link UserInfo}. - * NOTE: This class has been automatically generated from the {@link UserInfo} original class using Vert.x codegen. - */ -@io.vertx.codegen.annotations.VertxGen -public interface UserInfoParametersMapper extends io.vertx.sqlclient.templates.TupleMapper { - - UserInfoParametersMapper INSTANCE = new UserInfoParametersMapper() {}; - - default io.vertx.sqlclient.Tuple map(java.util.function.Function mapping, int size, UserInfo params) { - java.util.Map args = map(params); - Object[] array = new Object[size]; - for (int i = 0;i < array.length;i++) { - String column = mapping.apply(i); - array[i] = args.get(column); - } - return io.vertx.sqlclient.Tuple.wrap(array); - } - - default java.util.Map map(UserInfo obj) { - java.util.Map params = new java.util.HashMap<>(); - params.put("permission", obj.getPermission()); - params.put("pwd_crc32", obj.getPwdCrc32()); - params.put("username", obj.getUsername()); - params.put("uuid", obj.getUuid()); - return params; - } -} diff --git a/web/src/main/generated/cn/com/yhinfo/real/common/model/UserInfoRowMapper.java b/web/src/main/generated/cn/com/yhinfo/real/common/model/UserInfoRowMapper.java deleted file mode 100644 index cce0233..0000000 --- a/web/src/main/generated/cn/com/yhinfo/real/common/model/UserInfoRowMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.com.yhinfo.real.common.model; - -/** - * Mapper for {@link UserInfo}. - * NOTE: This class has been automatically generated from the {@link UserInfo} original class using Vert.x codegen. - */ -@io.vertx.codegen.annotations.VertxGen -public interface UserInfoRowMapper extends io.vertx.sqlclient.templates.RowMapper { - - @io.vertx.codegen.annotations.GenIgnore - UserInfoRowMapper INSTANCE = new UserInfoRowMapper() { }; - - @io.vertx.codegen.annotations.GenIgnore - java.util.stream.Collector> COLLECTOR = java.util.stream.Collectors.mapping(INSTANCE::map, java.util.stream.Collectors.toList()); - - @io.vertx.codegen.annotations.GenIgnore - default UserInfo map(io.vertx.sqlclient.Row row) { - UserInfo obj = new UserInfo(); - Object val; - int idx; - if ((idx = row.getColumnIndex("permission")) != -1 && (val = row.getString(idx)) != null) { - obj.setPermission((java.lang.String)val); - } - if ((idx = row.getColumnIndex("pwd_crc32")) != -1 && (val = row.getString(idx)) != null) { - obj.setPwdCrc32((java.lang.String)val); - } - if ((idx = row.getColumnIndex("username")) != -1 && (val = row.getString(idx)) != null) { - obj.setUsername((java.lang.String)val); - } - if ((idx = row.getColumnIndex("uuid")) != -1 && (val = row.getString(idx)) != null) { - obj.setUuid((java.lang.String)val); - } - return obj; - } -} diff --git a/web/src/main/generated/cn/com/yhinfo/real/web/service/DbServiceVertxEBProxy.java b/web/src/main/generated/cn/com/yhinfo/real/web/service/DbServiceVertxEBProxy.java deleted file mode 100644 index b701bae..0000000 --- a/web/src/main/generated/cn/com/yhinfo/real/web/service/DbServiceVertxEBProxy.java +++ /dev/null @@ -1,89 +0,0 @@ -/* -* Copyright 2014 Red Hat, Inc. -* -* Red Hat licenses this file to you under the Apache License, version 2.0 -* (the "License"); you may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -* License for the specific language governing permissions and limitations -* under the License. -*/ - -package cn.com.yhinfo.real.web.service; - -import io.vertx.core.eventbus.DeliveryOptions; -import io.vertx.core.Vertx; -import io.vertx.core.Future; -import io.vertx.core.json.JsonObject; -import io.vertx.core.json.JsonArray; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.function.Function; -import io.vertx.serviceproxy.ServiceException; -import io.vertx.serviceproxy.ServiceExceptionMessageCodec; -import io.vertx.serviceproxy.ProxyUtils; - -import cn.com.yhinfo.real.common.model.UserInfo; -import cn.com.yhinfo.core.base.BaseAsyncService; -import io.vertx.core.Future; -/* - Generated Proxy code - DO NOT EDIT - @author Roger the Robot -*/ - -@SuppressWarnings({"unchecked", "rawtypes"}) -public class DbServiceVertxEBProxy implements DbService { - private Vertx _vertx; - private String _address; - private DeliveryOptions _options; - private boolean closed; - - public DbServiceVertxEBProxy(Vertx vertx, String address) { - this(vertx, address, null); - } - - public DbServiceVertxEBProxy(Vertx vertx, String address, DeliveryOptions options) { - this._vertx = vertx; - this._address = address; - this._options = options; - try { - this._vertx.eventBus().registerDefaultCodec(ServiceException.class, new ServiceExceptionMessageCodec()); - } catch (IllegalStateException ex) { - } - } - - @Override - public Future sayOk(String data){ - if (closed) return io.vertx.core.Future.failedFuture("Proxy is closed"); - JsonObject _json = new JsonObject(); - _json.put("data", data); - - DeliveryOptions _deliveryOptions = (_options != null) ? new DeliveryOptions(_options) : new DeliveryOptions(); - _deliveryOptions.addHeader("action", "sayOk"); - return _vertx.eventBus().request(_address, _json, _deliveryOptions).map(msg -> { - return msg.body(); - }); - } - @Override - public Future sayOk2(String data, UserInfo holder){ - if (closed) return io.vertx.core.Future.failedFuture("Proxy is closed"); - JsonObject _json = new JsonObject(); - _json.put("data", data); - _json.put("holder", holder != null ? holder.toJson() : null); - - DeliveryOptions _deliveryOptions = (_options != null) ? new DeliveryOptions(_options) : new DeliveryOptions(); - _deliveryOptions.addHeader("action", "sayOk2"); - return _vertx.eventBus().request(_address, _json, _deliveryOptions).map(msg -> { - return msg.body(); - }); - } -} diff --git a/web/src/main/generated/cn/com/yhinfo/real/web/service/DbServiceVertxProxyHandler.java b/web/src/main/generated/cn/com/yhinfo/real/web/service/DbServiceVertxProxyHandler.java deleted file mode 100644 index 1f573e9..0000000 --- a/web/src/main/generated/cn/com/yhinfo/real/web/service/DbServiceVertxProxyHandler.java +++ /dev/null @@ -1,140 +0,0 @@ -/* -* Copyright 2014 Red Hat, Inc. -* -* Red Hat licenses this file to you under the Apache License, version 2.0 -* (the "License"); you may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -* License for the specific language governing permissions and limitations -* under the License. -*/ - -package cn.com.yhinfo.real.web.service; - -import cn.com.yhinfo.real.web.service.DbService; -import io.vertx.core.Vertx; -import io.vertx.core.Handler; -import io.vertx.core.AsyncResult; -import io.vertx.core.eventbus.EventBus; -import io.vertx.core.eventbus.Message; -import io.vertx.core.eventbus.MessageConsumer; -import io.vertx.core.eventbus.DeliveryOptions; -import io.vertx.core.eventbus.ReplyException; -import io.vertx.core.json.JsonObject; -import io.vertx.core.json.JsonArray; -import java.util.Collection; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import io.vertx.serviceproxy.ProxyHandler; -import io.vertx.serviceproxy.ServiceException; -import io.vertx.serviceproxy.ServiceExceptionMessageCodec; -import io.vertx.serviceproxy.HelperUtils; -import io.vertx.serviceproxy.ServiceBinder; - -import cn.com.yhinfo.real.common.model.UserInfo; -import cn.com.yhinfo.core.base.BaseAsyncService; -import io.vertx.core.Future; -/* - Generated Proxy code - DO NOT EDIT - @author Roger the Robot -*/ - -@SuppressWarnings({"unchecked", "rawtypes"}) -public class DbServiceVertxProxyHandler extends ProxyHandler { - - public static final long DEFAULT_CONNECTION_TIMEOUT = 5 * 60; // 5 minutes - private final Vertx vertx; - private final DbService service; - private final long timerID; - private long lastAccessed; - private final long timeoutSeconds; - private final boolean includeDebugInfo; - - public DbServiceVertxProxyHandler(Vertx vertx, DbService service){ - this(vertx, service, DEFAULT_CONNECTION_TIMEOUT); - } - - public DbServiceVertxProxyHandler(Vertx vertx, DbService service, long timeoutInSecond){ - this(vertx, service, true, timeoutInSecond); - } - - public DbServiceVertxProxyHandler(Vertx vertx, DbService service, boolean topLevel, long timeoutInSecond){ - this(vertx, service, true, timeoutInSecond, false); - } - - public DbServiceVertxProxyHandler(Vertx vertx, DbService service, boolean topLevel, long timeoutSeconds, boolean includeDebugInfo) { - this.vertx = vertx; - this.service = service; - this.includeDebugInfo = includeDebugInfo; - this.timeoutSeconds = timeoutSeconds; - try { - this.vertx.eventBus().registerDefaultCodec(ServiceException.class, - new ServiceExceptionMessageCodec()); - } catch (IllegalStateException ex) {} - if (timeoutSeconds != -1 && !topLevel) { - long period = timeoutSeconds * 1000 / 2; - if (period > 10000) { - period = 10000; - } - this.timerID = vertx.setPeriodic(period, this::checkTimedOut); - } else { - this.timerID = -1; - } - accessed(); - } - - - private void checkTimedOut(long id) { - long now = System.nanoTime(); - if (now - lastAccessed > timeoutSeconds * 1000000000) { - close(); - } - } - - @Override - public void close() { - if (timerID != -1) { - vertx.cancelTimer(timerID); - } - super.close(); - } - - private void accessed() { - this.lastAccessed = System.nanoTime(); - } - - public void handle(Message msg) { - try{ - JsonObject json = msg.body(); - String action = msg.headers().get("action"); - if (action == null) throw new IllegalStateException("action not specified"); - accessed(); - switch (action) { - case "sayOk": { - service.sayOk((java.lang.String)json.getValue("data")).onComplete(HelperUtils.createHandler(msg, includeDebugInfo)); - break; - } - case "sayOk2": { - service.sayOk2((java.lang.String)json.getValue("data"), - json.getJsonObject("holder") != null ? new cn.com.yhinfo.real.common.model.UserInfo((JsonObject)json.getJsonObject("holder")) : null).onComplete(HelperUtils.createHandler(msg, includeDebugInfo)); - break; - } - default: throw new IllegalStateException("Invalid action: " + action); - } - } catch (Throwable t) { - if (includeDebugInfo) msg.reply(new ServiceException(500, t.getMessage(), HelperUtils.generateDebugInfo(t))); - else msg.reply(new ServiceException(500, t.getMessage())); - throw t; - } - } -} \ No newline at end of file diff --git a/web/src/main/generated/cn/com/yhinfo/real/web/service/UserServiceVertxEBProxy.java b/web/src/main/generated/cn/com/yhinfo/real/web/service/UserServiceVertxEBProxy.java deleted file mode 100644 index f395d4d..0000000 --- a/web/src/main/generated/cn/com/yhinfo/real/web/service/UserServiceVertxEBProxy.java +++ /dev/null @@ -1,76 +0,0 @@ -/* -* Copyright 2014 Red Hat, Inc. -* -* Red Hat licenses this file to you under the Apache License, version 2.0 -* (the "License"); you may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -* License for the specific language governing permissions and limitations -* under the License. -*/ - -package cn.com.yhinfo.real.web.service; - -import io.vertx.core.eventbus.DeliveryOptions; -import io.vertx.core.Vertx; -import io.vertx.core.Future; -import io.vertx.core.json.JsonObject; -import io.vertx.core.json.JsonArray; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.function.Function; -import io.vertx.serviceproxy.ServiceException; -import io.vertx.serviceproxy.ServiceExceptionMessageCodec; -import io.vertx.serviceproxy.ProxyUtils; - -import cn.com.yhinfo.core.base.BaseAsyncService; -import cn.com.yhinfo.real.web.model.RealUser; -import io.vertx.core.Future; -/* - Generated Proxy code - DO NOT EDIT - @author Roger the Robot -*/ - -@SuppressWarnings({"unchecked", "rawtypes"}) -public class UserServiceVertxEBProxy implements UserService { - private Vertx _vertx; - private String _address; - private DeliveryOptions _options; - private boolean closed; - - public UserServiceVertxEBProxy(Vertx vertx, String address) { - this(vertx, address, null); - } - - public UserServiceVertxEBProxy(Vertx vertx, String address, DeliveryOptions options) { - this._vertx = vertx; - this._address = address; - this._options = options; - try { - this._vertx.eventBus().registerDefaultCodec(ServiceException.class, new ServiceExceptionMessageCodec()); - } catch (IllegalStateException ex) { - } - } - - @Override - public Future login(RealUser user){ - if (closed) return io.vertx.core.Future.failedFuture("Proxy is closed"); - JsonObject _json = new JsonObject(); - _json.put("user", user != null ? user.toJson() : null); - - DeliveryOptions _deliveryOptions = (_options != null) ? new DeliveryOptions(_options) : new DeliveryOptions(); - _deliveryOptions.addHeader("action", "login"); - return _vertx.eventBus().request(_address, _json, _deliveryOptions).map(msg -> { - return msg.body(); - }); - } -} diff --git a/web/src/main/generated/cn/com/yhinfo/real/web/service/UserServiceVertxProxyHandler.java b/web/src/main/generated/cn/com/yhinfo/real/web/service/UserServiceVertxProxyHandler.java deleted file mode 100644 index dbac9d3..0000000 --- a/web/src/main/generated/cn/com/yhinfo/real/web/service/UserServiceVertxProxyHandler.java +++ /dev/null @@ -1,135 +0,0 @@ -/* -* Copyright 2014 Red Hat, Inc. -* -* Red Hat licenses this file to you under the Apache License, version 2.0 -* (the "License"); you may not use this file except in compliance with the -* License. You may obtain a copy of the License at: -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -* License for the specific language governing permissions and limitations -* under the License. -*/ - -package cn.com.yhinfo.real.web.service; - -import cn.com.yhinfo.real.web.service.UserService; -import io.vertx.core.Vertx; -import io.vertx.core.Handler; -import io.vertx.core.AsyncResult; -import io.vertx.core.eventbus.EventBus; -import io.vertx.core.eventbus.Message; -import io.vertx.core.eventbus.MessageConsumer; -import io.vertx.core.eventbus.DeliveryOptions; -import io.vertx.core.eventbus.ReplyException; -import io.vertx.core.json.JsonObject; -import io.vertx.core.json.JsonArray; -import java.util.Collection; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import io.vertx.serviceproxy.ProxyHandler; -import io.vertx.serviceproxy.ServiceException; -import io.vertx.serviceproxy.ServiceExceptionMessageCodec; -import io.vertx.serviceproxy.HelperUtils; -import io.vertx.serviceproxy.ServiceBinder; - -import cn.com.yhinfo.core.base.BaseAsyncService; -import cn.com.yhinfo.real.web.model.RealUser; -import io.vertx.core.Future; -/* - Generated Proxy code - DO NOT EDIT - @author Roger the Robot -*/ - -@SuppressWarnings({"unchecked", "rawtypes"}) -public class UserServiceVertxProxyHandler extends ProxyHandler { - - public static final long DEFAULT_CONNECTION_TIMEOUT = 5 * 60; // 5 minutes - private final Vertx vertx; - private final UserService service; - private final long timerID; - private long lastAccessed; - private final long timeoutSeconds; - private final boolean includeDebugInfo; - - public UserServiceVertxProxyHandler(Vertx vertx, UserService service){ - this(vertx, service, DEFAULT_CONNECTION_TIMEOUT); - } - - public UserServiceVertxProxyHandler(Vertx vertx, UserService service, long timeoutInSecond){ - this(vertx, service, true, timeoutInSecond); - } - - public UserServiceVertxProxyHandler(Vertx vertx, UserService service, boolean topLevel, long timeoutInSecond){ - this(vertx, service, true, timeoutInSecond, false); - } - - public UserServiceVertxProxyHandler(Vertx vertx, UserService service, boolean topLevel, long timeoutSeconds, boolean includeDebugInfo) { - this.vertx = vertx; - this.service = service; - this.includeDebugInfo = includeDebugInfo; - this.timeoutSeconds = timeoutSeconds; - try { - this.vertx.eventBus().registerDefaultCodec(ServiceException.class, - new ServiceExceptionMessageCodec()); - } catch (IllegalStateException ex) {} - if (timeoutSeconds != -1 && !topLevel) { - long period = timeoutSeconds * 1000 / 2; - if (period > 10000) { - period = 10000; - } - this.timerID = vertx.setPeriodic(period, this::checkTimedOut); - } else { - this.timerID = -1; - } - accessed(); - } - - - private void checkTimedOut(long id) { - long now = System.nanoTime(); - if (now - lastAccessed > timeoutSeconds * 1000000000) { - close(); - } - } - - @Override - public void close() { - if (timerID != -1) { - vertx.cancelTimer(timerID); - } - super.close(); - } - - private void accessed() { - this.lastAccessed = System.nanoTime(); - } - - public void handle(Message msg) { - try{ - JsonObject json = msg.body(); - String action = msg.headers().get("action"); - if (action == null) throw new IllegalStateException("action not specified"); - accessed(); - switch (action) { - case "login": { - service.login(json.getJsonObject("user") != null ? new cn.com.yhinfo.real.web.model.RealUser((JsonObject)json.getJsonObject("user")) : null).onComplete(HelperUtils.createHandler(msg, includeDebugInfo)); - break; - } - default: throw new IllegalStateException("Invalid action: " + action); - } - } catch (Throwable t) { - if (includeDebugInfo) msg.reply(new ServiceException(500, t.getMessage(), HelperUtils.generateDebugInfo(t))); - else msg.reply(new ServiceException(500, t.getMessage())); - throw t; - } - } -} \ No newline at end of file diff --git a/web/src/main/java/cn/com/yhinfo/real/package-info.java b/web/src/main/java/cn/com/yhinfo/real/package-info.java deleted file mode 100644 index 86c05b1..0000000 --- a/web/src/main/java/cn/com/yhinfo/real/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * sinoreal2-web - *
Create date 2021/7/8 13:29 - * - * @author QAIU - */ -@ModuleGen(name = "proxy", groupPackage = "cn.com.yhinfo.real", useFutures = true) -package cn.com.yhinfo.real; - -import io.vertx.codegen.annotations.ModuleGen; \ No newline at end of file diff --git a/web/src/main/java/cn/com/yhinfo/real/AppMain.java b/web/src/main/java/cn/qaiu/lz/AppMain.java similarity index 87% rename from web/src/main/java/cn/com/yhinfo/real/AppMain.java rename to web/src/main/java/cn/qaiu/lz/AppMain.java index 715b46a..6b653dc 100644 --- a/web/src/main/java/cn/com/yhinfo/real/AppMain.java +++ b/web/src/main/java/cn/qaiu/lz/AppMain.java @@ -1,6 +1,6 @@ -package cn.com.yhinfo.real; +package cn.qaiu.lz; -import cn.com.yhinfo.core.Deploy; +import cn.qaiu.vx.core.Deploy; import io.vertx.core.json.JsonObject; diff --git a/web/src/main/java/cn/com/yhinfo/real/common/ToJson.java b/web/src/main/java/cn/qaiu/lz/common/ToJson.java similarity index 91% rename from web/src/main/java/cn/com/yhinfo/real/common/ToJson.java rename to web/src/main/java/cn/qaiu/lz/common/ToJson.java index b04cdf0..6e4d0ba 100644 --- a/web/src/main/java/cn/com/yhinfo/real/common/ToJson.java +++ b/web/src/main/java/cn/qaiu/lz/common/ToJson.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.real.common; +package cn.qaiu.lz.common; import io.vertx.core.json.JsonObject; diff --git a/web/src/main/java/cn/com/yhinfo/real/common/interceptorImpl/DefaultInterceptor.java b/web/src/main/java/cn/qaiu/lz/common/interceptorImpl/DefaultInterceptor.java similarity index 78% rename from web/src/main/java/cn/com/yhinfo/real/common/interceptorImpl/DefaultInterceptor.java rename to web/src/main/java/cn/qaiu/lz/common/interceptorImpl/DefaultInterceptor.java index b10cfc2..a0d1e9e 100644 --- a/web/src/main/java/cn/com/yhinfo/real/common/interceptorImpl/DefaultInterceptor.java +++ b/web/src/main/java/cn/qaiu/lz/common/interceptorImpl/DefaultInterceptor.java @@ -1,11 +1,11 @@ -package cn.com.yhinfo.real.common.interceptorImpl; +package cn.qaiu.lz.common.interceptorImpl; -import cn.com.yhinfo.core.base.BaseHttpApi; -import cn.com.yhinfo.core.interceptor.Interceptor; -import cn.com.yhinfo.core.model.JsonResult; -import cn.com.yhinfo.core.util.CommonUtil; -import cn.com.yhinfo.core.util.SharedDataUtil; -import cn.com.yhinfo.core.util.VertxHolder; +import cn.qaiu.vx.core.base.BaseHttpApi; +import cn.qaiu.vx.core.interceptor.Interceptor; +import cn.qaiu.vx.core.model.JsonResult; +import cn.qaiu.vx.core.util.CommonUtil; +import cn.qaiu.vx.core.util.SharedDataUtil; +import cn.qaiu.vx.core.util.VertxHolder; import io.vertx.core.json.JsonArray; import io.vertx.core.shareddata.LocalMap; import io.vertx.ext.web.RoutingContext; diff --git a/web/src/main/java/cn/com/yhinfo/real/common/model/MyData.java b/web/src/main/java/cn/qaiu/lz/common/model/MyData.java similarity index 94% rename from web/src/main/java/cn/com/yhinfo/real/common/model/MyData.java rename to web/src/main/java/cn/qaiu/lz/common/model/MyData.java index 1b2409c..2b02228 100644 --- a/web/src/main/java/cn/com/yhinfo/real/common/model/MyData.java +++ b/web/src/main/java/cn/qaiu/lz/common/model/MyData.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.real.common.model; +package cn.qaiu.lz.common.model; import io.vertx.codegen.annotations.DataObject; import io.vertx.codegen.format.SnakeCase; diff --git a/web/src/main/java/cn/com/yhinfo/real/common/model/UserInfo.java b/web/src/main/java/cn/qaiu/lz/common/model/UserInfo.java similarity index 92% rename from web/src/main/java/cn/com/yhinfo/real/common/model/UserInfo.java rename to web/src/main/java/cn/qaiu/lz/common/model/UserInfo.java index 4c853f2..803cd49 100644 --- a/web/src/main/java/cn/com/yhinfo/real/common/model/UserInfo.java +++ b/web/src/main/java/cn/qaiu/lz/common/model/UserInfo.java @@ -1,6 +1,6 @@ -package cn.com.yhinfo.real.common.model; +package cn.qaiu.lz.common.model; -import cn.com.yhinfo.real.common.ToJson; +import cn.qaiu.lz.common.ToJson; import io.vertx.codegen.annotations.DataObject; import io.vertx.codegen.format.SnakeCase; import io.vertx.core.json.JsonObject; diff --git a/web/src/main/java/cn/com/yhinfo/real/common/util/ArrayUtil.java b/web/src/main/java/cn/qaiu/lz/common/util/ArrayUtil.java similarity index 92% rename from web/src/main/java/cn/com/yhinfo/real/common/util/ArrayUtil.java rename to web/src/main/java/cn/qaiu/lz/common/util/ArrayUtil.java index 12ad6d9..7973d2f 100644 --- a/web/src/main/java/cn/com/yhinfo/real/common/util/ArrayUtil.java +++ b/web/src/main/java/cn/qaiu/lz/common/util/ArrayUtil.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.real.common.util; +package cn.qaiu.lz.common.util; public class ArrayUtil { diff --git a/web/src/main/java/cn/com/yhinfo/real/common/util/ConnectUtil.java b/web/src/main/java/cn/qaiu/lz/common/util/ConnectUtil.java similarity index 87% rename from web/src/main/java/cn/com/yhinfo/real/common/util/ConnectUtil.java rename to web/src/main/java/cn/qaiu/lz/common/util/ConnectUtil.java index 80e1fe9..0ea396a 100644 --- a/web/src/main/java/cn/com/yhinfo/real/common/util/ConnectUtil.java +++ b/web/src/main/java/cn/qaiu/lz/common/util/ConnectUtil.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.real.common.util; +package cn.qaiu.lz.common.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/web/src/main/java/cn/qaiu/lz/package-info.java b/web/src/main/java/cn/qaiu/lz/package-info.java new file mode 100644 index 0000000..dec3921 --- /dev/null +++ b/web/src/main/java/cn/qaiu/lz/package-info.java @@ -0,0 +1,10 @@ +/** + * sinoreal2-web + *
Create date 2021/7/8 13:29 + * + * @author QAIU + */ +@ModuleGen(name = "proxy", groupPackage = "cn.qaiu.lz", useFutures = true) +package cn.qaiu.lz; + +import io.vertx.codegen.annotations.ModuleGen; diff --git a/web/src/main/java/cn/com/yhinfo/real/web/http/ServerApi.java b/web/src/main/java/cn/qaiu/lz/web/http/ServerApi.java similarity index 79% rename from web/src/main/java/cn/com/yhinfo/real/web/http/ServerApi.java rename to web/src/main/java/cn/qaiu/lz/web/http/ServerApi.java index 918ef4b..a3f5b67 100644 --- a/web/src/main/java/cn/com/yhinfo/real/web/http/ServerApi.java +++ b/web/src/main/java/cn/qaiu/lz/web/http/ServerApi.java @@ -1,21 +1,21 @@ -package cn.com.yhinfo.real.web.http; +package cn.qaiu.lz.web.http; -import cn.com.yhinfo.core.annotaions.RouteHandler; -import cn.com.yhinfo.core.annotaions.RouteMapping; -import cn.com.yhinfo.core.annotaions.SockRouteMapper; -import cn.com.yhinfo.core.enums.RouteMethod; -import cn.com.yhinfo.core.model.JsonResult; -import cn.com.yhinfo.core.util.AsyncServiceUtil; -import cn.com.yhinfo.core.util.SnowflakeIdWorker; -import cn.com.yhinfo.core.util.VertxHolder; -import cn.com.yhinfo.real.web.model.RealUser; -import cn.com.yhinfo.real.web.service.UserService; +import cn.qaiu.lz.web.service.UserService; +import cn.qaiu.vx.core.annotaions.RouteHandler; +import cn.qaiu.vx.core.annotaions.RouteMapping; +import cn.qaiu.vx.core.annotaions.SockRouteMapper; +import cn.qaiu.vx.core.enums.RouteMethod; +import cn.qaiu.vx.core.model.JsonResult; +import cn.qaiu.vx.core.util.AsyncServiceUtil; +import cn.qaiu.vx.core.util.SnowflakeIdWorker; +import cn.qaiu.vx.core.util.VertxHolder; +import cn.qaiu.lz.web.model.RealUser; import io.vertx.core.Future; import io.vertx.ext.web.handler.sockjs.SockJSSocket; import lombok.extern.slf4j.Slf4j; /** - * 连接服务API + * 服务API *
Create date 2021/4/28 9:15 * * @author QAIU diff --git a/web/src/main/java/cn/com/yhinfo/real/web/model/RealUser.java b/web/src/main/java/cn/qaiu/lz/web/model/RealUser.java similarity index 85% rename from web/src/main/java/cn/com/yhinfo/real/web/model/RealUser.java rename to web/src/main/java/cn/qaiu/lz/web/model/RealUser.java index d57a19f..61e07ef 100644 --- a/web/src/main/java/cn/com/yhinfo/real/web/model/RealUser.java +++ b/web/src/main/java/cn/qaiu/lz/web/model/RealUser.java @@ -1,6 +1,6 @@ -package cn.com.yhinfo.real.web.model; +package cn.qaiu.lz.web.model; -import cn.com.yhinfo.real.common.ToJson; +import cn.qaiu.lz.common.ToJson; import io.vertx.codegen.annotations.DataObject; import io.vertx.core.json.JsonObject; import lombok.AllArgsConstructor; diff --git a/web/src/main/java/cn/com/yhinfo/real/web/service/DbService.java b/web/src/main/java/cn/qaiu/lz/web/service/DbService.java similarity index 74% rename from web/src/main/java/cn/com/yhinfo/real/web/service/DbService.java rename to web/src/main/java/cn/qaiu/lz/web/service/DbService.java index 0a4da83..28d6513 100644 --- a/web/src/main/java/cn/com/yhinfo/real/web/service/DbService.java +++ b/web/src/main/java/cn/qaiu/lz/web/service/DbService.java @@ -1,7 +1,7 @@ -package cn.com.yhinfo.real.web.service; +package cn.qaiu.lz.web.service; -import cn.com.yhinfo.core.base.BaseAsyncService; -import cn.com.yhinfo.real.common.model.UserInfo; +import cn.qaiu.lz.common.model.UserInfo; +import cn.qaiu.vx.core.base.BaseAsyncService; import io.vertx.codegen.annotations.ProxyGen; import io.vertx.core.Future; import io.vertx.core.json.JsonObject; diff --git a/web/src/main/java/cn/com/yhinfo/real/web/service/JdkProxyFactory.java b/web/src/main/java/cn/qaiu/lz/web/service/JdkProxyFactory.java similarity index 81% rename from web/src/main/java/cn/com/yhinfo/real/web/service/JdkProxyFactory.java rename to web/src/main/java/cn/qaiu/lz/web/service/JdkProxyFactory.java index 5000f5c..8cc40c4 100644 --- a/web/src/main/java/cn/com/yhinfo/real/web/service/JdkProxyFactory.java +++ b/web/src/main/java/cn/qaiu/lz/web/service/JdkProxyFactory.java @@ -1,6 +1,6 @@ -package cn.com.yhinfo.real.web.service; +package cn.qaiu.lz.web.service; -import cn.com.yhinfo.core.util.CastUtil; +import cn.qaiu.vx.core.util.CastUtil; import java.lang.reflect.Proxy; @@ -15,4 +15,4 @@ public class JdkProxyFactory { new ServiceJdkProxy<>(target)) ); } -} \ No newline at end of file +} diff --git a/web/src/main/java/cn/com/yhinfo/real/web/service/ServiceJdkProxy.java b/web/src/main/java/cn/qaiu/lz/web/service/ServiceJdkProxy.java similarity index 94% rename from web/src/main/java/cn/com/yhinfo/real/web/service/ServiceJdkProxy.java rename to web/src/main/java/cn/qaiu/lz/web/service/ServiceJdkProxy.java index 061ee6e..48bb435 100644 --- a/web/src/main/java/cn/com/yhinfo/real/web/service/ServiceJdkProxy.java +++ b/web/src/main/java/cn/qaiu/lz/web/service/ServiceJdkProxy.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.real.web.service; +package cn.qaiu.lz.web.service; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/cn/com/yhinfo/real/web/service/UserService.java b/web/src/main/java/cn/qaiu/lz/web/service/UserService.java similarity index 68% rename from web/src/main/java/cn/com/yhinfo/real/web/service/UserService.java rename to web/src/main/java/cn/qaiu/lz/web/service/UserService.java index cfae4dc..deca2fd 100644 --- a/web/src/main/java/cn/com/yhinfo/real/web/service/UserService.java +++ b/web/src/main/java/cn/qaiu/lz/web/service/UserService.java @@ -1,7 +1,7 @@ -package cn.com.yhinfo.real.web.service; +package cn.qaiu.lz.web.service; -import cn.com.yhinfo.core.base.BaseAsyncService; -import cn.com.yhinfo.real.web.model.RealUser; +import cn.qaiu.vx.core.base.BaseAsyncService; +import cn.qaiu.lz.web.model.RealUser; import io.vertx.codegen.annotations.ProxyGen; import io.vertx.core.Future; diff --git a/web/src/main/java/cn/com/yhinfo/real/web/service/impl/DbServiceImpl.java b/web/src/main/java/cn/qaiu/lz/web/service/impl/DbServiceImpl.java similarity index 80% rename from web/src/main/java/cn/com/yhinfo/real/web/service/impl/DbServiceImpl.java rename to web/src/main/java/cn/qaiu/lz/web/service/impl/DbServiceImpl.java index 6b90534..a927697 100644 --- a/web/src/main/java/cn/com/yhinfo/real/web/service/impl/DbServiceImpl.java +++ b/web/src/main/java/cn/qaiu/lz/web/service/impl/DbServiceImpl.java @@ -1,9 +1,9 @@ -package cn.com.yhinfo.real.web.service.impl; +package cn.qaiu.lz.web.service.impl; -import cn.com.yhinfo.core.annotaions.Service; -import cn.com.yhinfo.core.model.JsonResult; -import cn.com.yhinfo.real.common.model.UserInfo; -import cn.com.yhinfo.real.web.service.DbService; +import cn.qaiu.lz.common.model.UserInfo; +import cn.qaiu.lz.web.service.DbService; +import cn.qaiu.vx.core.annotaions.Service; +import cn.qaiu.vx.core.model.JsonResult; import io.vertx.core.Future; import io.vertx.core.json.JsonObject; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/main/java/cn/com/yhinfo/real/web/service/impl/UserServiceImpl.java b/web/src/main/java/cn/qaiu/lz/web/service/impl/UserServiceImpl.java similarity index 63% rename from web/src/main/java/cn/com/yhinfo/real/web/service/impl/UserServiceImpl.java rename to web/src/main/java/cn/qaiu/lz/web/service/impl/UserServiceImpl.java index 5315272..8ac2191 100644 --- a/web/src/main/java/cn/com/yhinfo/real/web/service/impl/UserServiceImpl.java +++ b/web/src/main/java/cn/qaiu/lz/web/service/impl/UserServiceImpl.java @@ -1,8 +1,8 @@ -package cn.com.yhinfo.real.web.service.impl; +package cn.qaiu.lz.web.service.impl; -import cn.com.yhinfo.core.annotaions.Service; -import cn.com.yhinfo.real.web.model.RealUser; -import cn.com.yhinfo.real.web.service.UserService; +import cn.qaiu.lz.web.model.RealUser; +import cn.qaiu.lz.web.service.UserService; +import cn.qaiu.vx.core.annotaions.Service; import io.vertx.core.Future; /** diff --git a/web/src/main/resources/app-dev.yml b/web/src/main/resources/app-dev.yml index 2c1cb7c..690a24c 100644 --- a/web/src/main/resources/app-dev.yml +++ b/web/src/main/resources/app-dev.yml @@ -12,15 +12,14 @@ vertx: workerPoolSize: 20 custom: asyncServiceInstances: 8 - routerLocations: cn.com.yhinfo.real.web.http - interceptorClassPath: cn.com.yhinfo.real.common.interceptorImpl.DefaultInterceptor - handlerLocations: cn.com.yhinfo.real.web.service + routerLocations: cn.qaiu.lz.web.http + interceptorClassPath: cn.qaiu.lz.common.interceptorImpl.DefaultInterceptor + handlerLocations: cn.qaiu.lz.web.service ignoresReg: - .*/login$ - .*/test.*$ entityPackagesReg: - - ^cn\.com\.yhinfo\.real\.web\.model\..* - - ^sinereal\.core\..* + - ^cn\.qaiu\.lz\.web\.model\..* otherConfig: - dictionaries.json errorPage404: /index.html diff --git a/web/src/test/java/cn/com/yhinfo/test/StompTest.java b/web/src/test/java/cn/qaiu/web/test/StompTest.java similarity index 97% rename from web/src/test/java/cn/com/yhinfo/test/StompTest.java rename to web/src/test/java/cn/qaiu/web/test/StompTest.java index 37f531d..c809d29 100644 --- a/web/src/test/java/cn/com/yhinfo/test/StompTest.java +++ b/web/src/test/java/cn/qaiu/web/test/StompTest.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.test; +package cn.qaiu.web.test; import io.vertx.core.Future; import io.vertx.core.Vertx; diff --git a/web/src/test/java/cn/com/yhinfo/test/Test01.java b/web/src/test/java/cn/qaiu/web/test/Test01.java similarity index 99% rename from web/src/test/java/cn/com/yhinfo/test/Test01.java rename to web/src/test/java/cn/qaiu/web/test/Test01.java index 910dd7d..a8b27dc 100644 --- a/web/src/test/java/cn/com/yhinfo/test/Test01.java +++ b/web/src/test/java/cn/qaiu/web/test/Test01.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.test; +package cn.qaiu.web.test; import io.vertx.ext.web.RoutingContext; import lombok.extern.slf4j.Slf4j; diff --git a/web/src/test/java/cn/com/yhinfo/test/Test02.java b/web/src/test/java/cn/qaiu/web/test/Test02.java similarity index 98% rename from web/src/test/java/cn/com/yhinfo/test/Test02.java rename to web/src/test/java/cn/qaiu/web/test/Test02.java index 413a9a0..c5f8ec9 100644 --- a/web/src/test/java/cn/com/yhinfo/test/Test02.java +++ b/web/src/test/java/cn/qaiu/web/test/Test02.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.test; +package cn.qaiu.web.test; import javassist.ClassPool; import javassist.CtClass; @@ -82,4 +82,4 @@ public class Test02 { System.out.println(map); } -} \ No newline at end of file +} diff --git a/web/src/test/java/cn/com/yhinfo/test/TestOS.java b/web/src/test/java/cn/qaiu/web/test/TestOS.java similarity index 99% rename from web/src/test/java/cn/com/yhinfo/test/TestOS.java rename to web/src/test/java/cn/qaiu/web/test/TestOS.java index 746fb77..324b663 100644 --- a/web/src/test/java/cn/com/yhinfo/test/TestOS.java +++ b/web/src/test/java/cn/qaiu/web/test/TestOS.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.test; +package cn.qaiu.web.test; import java.io.*; import java.net.InetAddress; @@ -158,4 +158,4 @@ public class TestOS { // new TestOS().showURL(); System.out.println(File.separator); } -} \ No newline at end of file +} diff --git a/web/src/test/java/cn/com/yhinfo/test/WebProxyExamples.java b/web/src/test/java/cn/qaiu/web/test/WebProxyExamples.java similarity index 99% rename from web/src/test/java/cn/com/yhinfo/test/WebProxyExamples.java rename to web/src/test/java/cn/qaiu/web/test/WebProxyExamples.java index 9a6b2e6..562cdaf 100644 --- a/web/src/test/java/cn/com/yhinfo/test/WebProxyExamples.java +++ b/web/src/test/java/cn/qaiu/web/test/WebProxyExamples.java @@ -1,4 +1,4 @@ -package cn.com.yhinfo.test; +package cn.qaiu.web.test; import io.vertx.core.Vertx; import io.vertx.core.http.HttpClient;