From dde745c12d1dc6ba2c6bd1990beeda7838d75a91 Mon Sep 17 00:00:00 2001 From: lvmoney Date: Mon, 30 Sep 2019 10:50:03 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0k8s1.16.0&isti?= =?UTF-8?q?o1.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lvmoney/k8s/base/enums/ApiVersion.java | 15 ++++++++++++++- .../k8s/base/service/impl/YamlServiceImpl.java | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/enums/ApiVersion.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/enums/ApiVersion.java index c79c59a..be07278 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/enums/ApiVersion.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/enums/ApiVersion.java @@ -14,13 +14,26 @@ package com.lvmoney.k8s.base.enums;/** */ public enum ApiVersion { /** - * apiversion extensions/v1beta1 + * apiversion extensions/v1beta1 ,k8s1.16.0后不再支持 */ + @Deprecated v1beta1("extensions/v1beta1"), + + /** + * networking.k8s.io/v1 + */ + networkingv1("networking.k8s.io/v1"), + + /** + * apps/v1 + */ + appsv1("apps/v1"), + /** * apiversion networking.istio.io/v1alpha3 */ v1alpha3("networking.istio.io/v1alpha3"), + /** * apiversion v1 */ diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java index e9bf335..a02a35a 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java @@ -148,7 +148,7 @@ public class YamlServiceImpl implements YamlService { @Override public Deployment buildDeployment() { Deployment deployment = new Deployment(); - deployment.setApiVersion(ApiVersion.v1beta1.getValue()); + deployment.setApiVersion(ApiVersion.appsv1.getValue()); deployment.setKind(YamlKind.Deployment.getValue()); Metadata dMetadata = new Metadata(); dMetadata.setName(applicationName + "-" + version); -- Gitee From 29908a5692421d305f3b72abf6f0097a8737d827 Mon Sep 17 00:00:00 2001 From: lvmoney Date: Mon, 30 Sep 2019 10:53:10 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0k8s1.16.0&isti?= =?UTF-8?q?o1.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frame-k8s-support/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/frame-k8s-support/readme.md b/frame-k8s-support/readme.md index 493bc3f..121e283 100644 --- a/frame-k8s-support/readme.md +++ b/frame-k8s-support/readme.md @@ -17,6 +17,7 @@ mysql的读写分离，分布式事务 分布式锁用redisson完成 当然如果涉及到大数据，那么spark，hadoop，flume，hbase按需加入到各个服务中，这是后话了 等等 +6、架构基于k8s1.16.0+istio1.3.0 -- Gitee From 1cf3a1ee69db256e424c7546abec83a9f23221b2 Mon Sep 17 00:00:00 2001 From: lvmoney Date: Mon, 30 Sep 2019 10:55:14 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0k8s1.16.0&isti?= =?UTF-8?q?o1.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index e9bc9d2..57196ee 100644 --- a/README.md +++ b/README.md @@ -30,20 +30,21 @@ netty #### 技术罗列 -springboot -springcloud -docker -istio -spark -hadoop -shiro -activti -jwt -kafka -rabbitmq -seata(fescar) -mongo -mybatisplus +springboot +springcloud +docker +k8s1.16.0 +istio1.3.0 +spark +hadoop +shiro +activti +jwt +kafka +rabbitmq +seata(fescar) +mongo +mybatisplus 等等 -- Gitee From e32153c8201421e1312b49548ec2d94aca553f11 Mon Sep 17 00:00:00 2001 From: lvmoney Date: Mon, 30 Sep 2019 10:55:43 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0k8s1.16.0&isti?= =?UTF-8?q?o1.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 57196ee..d5b6f07 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,8 @@ netty springboot springcloud docker -k8s1.16.0 -istio1.3.0 +k8s1.16.0 +istio1.3.0 spark hadoop shiro -- Gitee From 21b9f4539da67cbf2d9a4b78d74337111eb9c4e7 Mon Sep 17 00:00:00 2001 From: lvmoney Date: Mon, 30 Sep 2019 11:39:42 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0k8s1.16.0&isti?= =?UTF-8?q?o1.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/constant/ActivitiConstant.java | 2 +- .../activiti/controller/BaseController.java | 14 +++++++------- .../com/lvmoney/activiti/dao/UserMapper.java | 2 +- .../lvmoney/activiti/dao/VacationFormMapper.java | 2 +- .../lvmoney/activiti/delegate/ServiceTask.java | 2 +- .../activiti/listener/CountersignListener.java | 2 +- .../lvmoney/activiti/service/AccountService.java | 2 +- .../activiti/service/BaseActivitiService.java | 2 +- .../service/impl/BaseActivitiServiceImpl.java | 5 ++--- .../activiti/service/impl/DeleteTaskCmd.java | 2 +- .../service/impl/SetFlowNodeAndGoCmd.java | 2 +- .../activiti/{utils => util}/ResultInfo.java | 2 +- .../com/lvmoney/activiti/vo/ApprovalUser.java | 2 +- .../java/com/lvmoney/activiti/vo/AssigneeVo.java | 2 +- .../com/lvmoney/activiti/vo/CompleteTaskVo.java | 2 +- .../com/lvmoney/activiti/vo/CountersignUser.java | 2 +- .../java/com/lvmoney/activiti/vo/DelegateVo.java | 2 +- .../java/com/lvmoney/activiti/vo/HistoryVo.java | 2 +- .../main/java/com/lvmoney/activiti/vo/ImgVo.java | 2 +- .../com/lvmoney/activiti/vo/JumpReasonVo.java | 2 +- .../java/com/lvmoney/activiti/vo/JumpVo.java | 2 +- .../com/lvmoney/activiti/vo/QueryTaskVo.java | 2 +- .../java/com/lvmoney/activiti/vo/RevokeVo.java | 2 +- .../com/lvmoney/activiti/vo/StartProcessVo.java | 2 +- .../java/com/lvmoney/activiti/vo/UserVo.java | 2 +- .../src/test/java/ActivitiTest.java | 4 ++-- .../redis/application/CanalRedisApplication.java | 2 +- .../canal/redis/client/AbstractCanalClient.java | 7 ++----- .../impl/AbstractCanal2RedisServiceImpl.java | 4 +--- .../transfer/AbstractMessageTransponder.java | 5 ++--- .../transfer/DefaultMessageTransponder.java | 4 ++-- .../captcha/service/impl/CaptchaServiceImpl.java | 10 +++++----- .../BusinessException.java | 2 +- .../CommonException.java | 2 +- .../{exceptions => exception}/ExceptionType.java | 2 +- .../FrameRuntimeException.java | 2 +- .../{utils => util}/ApplicationBeanUtil.java | 4 ++-- .../common/{utils => util}/Base64Util.java | 6 +++--- .../lvmoney/common/{utils => util}/BeanUtil.java | 8 ++++---- .../lvmoney/common/{utils => util}/DateUtil.java | 2 +- .../common/{utils => util}/EcdsaUtil.java | 4 ++-- .../lvmoney/common/{utils => util}/FileUtil.java | 6 +++--- .../common/{utils => util}/IntervalUtil.java | 4 ++-- .../lvmoney/common/{utils => util}/IpUtil.java | 4 ++-- .../common/{utils => util}/JacksonUtil.java | 2 +- .../lvmoney/common/{utils => util}/JsonUtil.java | 2 +- .../lvmoney/common/{utils => util}/ListUtil.java | 7 ++----- .../common/{utils => util}/LocationUtil.java | 6 +++--- .../lvmoney/common/{utils => util}/MapUtil.java | 4 ++-- .../common/{utils => util}/ModuleUtil.java | 8 ++++---- .../{utils => util}/ObjectSerializerUtil.java | 2 +- .../common/{utils => util}/PhotoUtil.java | 4 ++-- .../common/{utils => util}/PinyinUtil.java | 2 +- .../common/{utils => util}/QrCodeUtil.java | 4 ++-- .../common/{utils => util}/ReflectUtil.java | 6 +++--- .../common/{utils => util}/ReflectionUtil.java | 2 +- .../common/{utils => util}/ResultUtil.java | 4 ++-- .../{utils => util}/SnowflakeIdFactoryUtil.java | 14 ++------------ .../lvmoney/common/{utils => util}/SortUtil.java | 2 +- .../common/{utils => util}/StringUtil.java | 4 ++-- .../lvmoney/common/{utils => util}/TreeUtil.java | 8 ++++---- .../common/{utils => util}/WildcardUtil.java | 4 ++-- .../dynamic/CharSequenceJavaFileObject.java | 2 +- .../dynamic/ClassFileManager.java | 2 +- .../{utils => util}/dynamic/DynaCompTest.java | 2 +- .../{utils => util}/dynamic/DynamicBean.java | 2 +- .../{utils => util}/dynamic/DynamicBeanUtil.java | 4 ++-- .../dynamic/DynamicClassLoader.java | 2 +- .../{utils => util}/dynamic/DynamicEngine.java | 2 +- .../{utils => util}/dynamic/JavaClassObject.java | 2 +- .../{utils => util}/vo/AliBaBaMapVoResp.java | 4 ++-- .../common/{utils => util}/vo/AmapVoResp.java | 4 ++-- .../{utils => util}/vo/BaiDuMapVoResp.java | 4 ++-- .../common/{utils => util}/vo/EcdsaVo.java | 2 +- .../common/{utils => util}/vo/LocationVo.java | 4 ++-- .../lvmoney/common/{utils => util}/vo/Menu.java | 2 +- .../common/{utils => util}/vo/ReflectVo.java | 2 +- .../common/{utils => util}/vo/ResultData.java | 8 ++++---- .../common/web/FrameExceptionHandlerAdvice.java | 8 ++++---- .../com/lvmoney/drools/constant/ProductEnum.java | 2 +- .../elasticsearch/controller/BaseController.java | 2 +- .../service/impl/ElasticsearchServiceImpl.java | 6 +++--- .../elasticsearch/vo/ElasticsearchNearbyVo.java | 2 +- .../rabbitmq/annotation/package-info.java | 2 +- .../service/impl/HttpApiServiceImpl.java | 4 ++-- .../{annotations => annotation}/NotToken.java | 4 ++-- .../jwt/controller/test/TestController.java | 6 +++--- .../lvmoney/jwt/interceptor/JwtInterceptor.java | 8 ++++---- .../jwt/service/impl/JwtRedisServiceImpl.java | 6 +++--- .../jwt/{utils => util}/FilterMapUtil.java | 4 ++-- .../com/lvmoney/jwt/{utils => util}/JwtUtil.java | 8 +++----- .../controller/AuthenticationController.java | 8 ++++---- .../service/AbstractOauth2LoginService.java | 2 +- .../base/controller/DockerFileController.java | 6 +++--- .../k8s/base/controller/SshController.java | 12 ++++++------ .../k8s/base/service/impl/K8sServiceImpl.java | 3 +-- .../k8s/base/service/impl/YamlServiceImpl.java | 7 ++----- .../k8s/base/{utils => util}/ExecCmdResult.java | 4 ++-- .../k8s/base/{utils => util}/PomUtil.java | 6 +++--- .../k8s/base/{utils => util}/Ssh2Util.java | 9 ++------- .../k8s/base/{utils => util}/YamlUtil.java | 6 +++--- .../src/test/java/com/lvmoney/yaml/SSHTest.java | 4 ++-- .../client/controller/ClientController.java | 2 +- .../customer/controller/CustomerController.java | 4 ++-- .../k8s/gateway/controller/IndexController.java | 2 +- .../k8s/gateway/exception/GatewayException.java | 2 +- .../k8s/gateway/filter/AuthenticationFilter.java | 8 +++----- .../k8s/gateway/init/AfterStartupInit.java | 3 +-- .../k8s/gateway/server/AuthenticationServer.java | 6 +++--- .../lvmoney/k8s/gateway/utils/ExceptionUtil.java | 11 +++++------ .../lvmoney/k8s/gateway/utils/FilterMapUtil.java | 4 ++-- .../service/impl/EsLogbackServiceImpl.java | 2 +- .../service/impl/LogbackAppender.java | 2 +- .../mongo/service/impl/LogbackAppender.java | 2 +- .../redis/service/impl/LogbackAppender.java | 3 +-- .../provider/controller/IndexController.java | 6 ++---- .../provider/controller/ProviderController.java | 4 ++-- .../resource/controller/ResourceController.java | 4 ++-- .../DynamicService.java | 2 +- .../lvmoney/kafka/constant/KafkaConstant.java | 2 +- .../lvmoney/kafka/customer/SimpleCustomer.java | 6 +++--- .../kafka/customer/SynchronousCustomer.java | 6 +++--- .../lvmoney/kafka/listener/ProviderListener.java | 5 ++--- .../com/lvmoney/kafka/provider/SimpleSender.java | 6 +++--- .../kafka/provider/SynchronousSender.java | 8 ++++---- .../java/com/lvmoney/kafka/ro/ErrorRecordRo.java | 2 +- .../lvmoney/kafka/service/KafkaRedisService.java | 2 +- .../service/impl/HandTestDataServiceImpl.java | 2 +- .../service/impl/KafkaRedisServiceImpl.java | 2 +- .../com/lvmoney/kafka/utils/ContextBeanUtil.java | 4 ++-- .../java/com/lvmoney/kafka/vo/MessageVo.java | 2 +- .../lock/service/impl/ProdLockServiceImpl.java | 4 ++-- .../lock/service/impl/SequenceServiceImpl.java | 2 +- .../ControllerLog.java | 2 +- .../log/{annotations => annotation}/NotLog.java | 4 ++-- .../{annotations => annotation}/ServiceLog.java | 2 +- .../java/com/lvmoney/log/aspect/LogAspect.java | 16 ++++++++-------- .../lvmoney/log/controller/UserController.java | 2 +- .../lvmoney/log/controller/LogController.java | 4 ++-- .../service/impl/BaseGridFsServiceImpl.java | 4 ++-- .../mongo/service/impl/BaseMongoServiceImpl.java | 4 ++-- .../base/{utils => util}/EncryptPwdUtil.java | 4 ++-- .../base/{utils => util}/MapperGenerator.java | 2 +- .../java/com/lvmoney/test/DemoServiceTest.java | 2 +- .../java/com/lvmoney/test/DemoServiceTest.java | 2 +- .../java/com/lvmoney/test/DemoServiceTest.java | 2 +- .../netty/client/client/NettyClientListener.java | 4 ++-- .../java/com/lvmoney/netty/util/ObjectCodec.java | 2 +- .../server/aspect/WebRequestLogAspect.java | 2 +- .../server/config/ClientAccessDeniedHandler.java | 2 +- .../ClientAuthenticationFailureHandler.java | 2 +- .../ClientAuthenticationSuccessHandler.java | 4 ++-- .../config/WeChatMiniProgramTokenGranter.java | 2 +- .../controller/AccessConfirmationController.java | 2 +- .../server/controller/CaptchaController.java | 2 +- .../server/controller/ManageUserController.java | 2 +- .../server/controller/ProfileController.java | 10 +--------- .../center/server/exception/Oauth2Exception.java | 3 +-- .../center/server/ro/Oauth2ClientDetailRo.java | 2 +- .../server/service/impl/Db2RedisServiceImpl.java | 2 +- .../service/impl/FrameRedisTokenStoreImpl.java | 2 +- .../service/impl/Oauth2RedisServiceImpl.java | 1 - .../impl/RedisClientDetailsServiceImpl.java | 7 ------- .../impl/RedisUserDetailsServiceImpl.java | 10 ---------- .../service/impl/ScopeDefinitionServiceImpl.java | 2 +- .../service/impl/UserAccountServiceImpl.java | 4 ++-- .../oauth2/center/server/utils/PasswordUtil.java | 2 +- .../assets/bootstrap/js/bootstrap.bundle.js | 2 +- .../lvmoney/oauth2/center/server/OAuth2Test.java | 2 +- .../office/controller/ExcelController.java | 2 +- .../lvmoney/office/controller/PoiController.java | 4 ++-- .../office/controller/TestController.java | 4 ++-- .../office/service/impl/WordServiceImpl.java | 10 +++++----- .../lvmoney/office/{utils => util}/DocxUtil.java | 2 +- .../office/{utils => util}/ExcelUtil.java | 6 +++--- .../com/lvmoney/office/vo/WordTemplateVo.java | 6 ------ .../com/lvmoney/quartz/config/QuartzManager.java | 10 +++------- .../java/com/lvmoney/quartz/job/AbstractJob.java | 3 --- .../DynamicService.java | 2 +- .../lvmoney/rabbitmq/ack/config/BaseConfig.java | 2 +- .../rabbitmq/ack/constant/RabbitmqConstant.java | 2 +- .../rabbitmq/ack/customer/FanoutReceiver.java | 8 ++++---- .../rabbitmq/ack/customer/SimpleReceiver.java | 8 ++++---- .../rabbitmq/ack/customer/TopicReceiver.java | 8 ++++---- .../rabbitmq/ack/provider/FanoutSender.java | 5 ++--- .../rabbitmq/ack/provider/SimpleSender.java | 5 ++--- .../rabbitmq/ack/provider/TopicSender.java | 5 ++--- .../rabbitmq/ack/ro/AckErrorRecordRo.java | 2 +- .../ack/service/RabbitmqRedisService.java | 2 +- .../service/impl/HandTestDataServiceImpl.java | 2 +- .../service/impl/RabbitmqRedisServiceImpl.java | 2 +- .../ack/{utils => util}/ContextBeanUtil.java | 6 +++--- .../com/lvmoney/rabbitmq/ack/vo/MessageVo.java | 2 +- .../com/lvmoney/rabbitmq/ack/vo/MsgErrorVo.java | 2 +- .../DynamicService.java | 2 +- .../package-info.java | 4 ++-- .../rabbitmq/customer/MqSynDataReceive.java | 6 +++--- .../com/lvmoney/rabbitmq/provider/MqSender.java | 2 +- .../service/impl/HandTestDataServiceImpl.java | 2 +- .../redis/service/impl/BaseRedisServiceImpl.java | 6 +++--- .../AuthenticationValidated.java | 4 ++-- .../ParamValidated.java | 4 ++-- .../PermissionValidated.java | 4 ++-- .../RouterMethod.java | 2 +- .../RouterService.java | 2 +- .../package-info.java | 4 ++-- .../router/controller/ApiRouterController.java | 14 +++++++------- .../router/service/impl/AServiceImpl.java | 14 +++++++------- .../spring/ApiServiceRegistryProcessor.java | 4 ++-- .../router/spring/RouterServiceHolder.java | 14 +++++++------- .../lvmoney/router/web/BuildRequestHandler.java | 2 +- .../lvmoney/router/web/GlobalParamsHandler.java | 2 +- .../router/web/HibernateValidationHandler.java | 6 +++--- .../com/lvmoney/router/web/JwtTokenHandler.java | 4 ++-- .../com/lvmoney/router/web/ShiroAuthHandler.java | 6 +++--- .../ShiroResouce.java | 2 +- .../lvmoney/shiro/filter/FrameShiroFilter.java | 6 +++--- .../com/lvmoney/shiro/init/AfterStartupInit.java | 2 +- .../com/lvmoney/shiro/realm/FrameShiroRealm.java | 4 ++-- .../service/impl/ShiroRedisServiceImpl.java | 2 +- .../shiro/{utils => util}/FilterMapUtil.java | 6 +++--- .../shiro/{utils => util}/RequestUtils.java | 2 +- .../signature/application/Application.java | 2 +- .../com/lvmoney/signature/application/Test1.java | 2 +- .../com/lvmoney/signature/application/Test2.java | 2 +- 225 files changed, 409 insertions(+), 491 deletions(-) rename frame-activiti-support/src/main/java/com/lvmoney/activiti/{utils => util}/ResultInfo.java (96%) rename frame-common/src/main/java/com/lvmoney/common/{exceptions => exception}/BusinessException.java (98%) rename frame-common/src/main/java/com/lvmoney/common/{exceptions => exception}/CommonException.java (99%) rename frame-common/src/main/java/com/lvmoney/common/{exceptions => exception}/ExceptionType.java (94%) rename frame-common/src/main/java/com/lvmoney/common/{exceptions => exception}/FrameRuntimeException.java (96%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/ApplicationBeanUtil.java (97%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/Base64Util.java (93%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/BeanUtil.java (97%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/DateUtil.java (94%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/EcdsaUtil.java (98%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/FileUtil.java (97%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/IntervalUtil.java (98%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/IpUtil.java (98%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/JacksonUtil.java (98%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/JsonUtil.java (99%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/ListUtil.java (88%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/LocationUtil.java (98%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/MapUtil.java (86%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/ModuleUtil.java (88%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/ObjectSerializerUtil.java (97%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/PhotoUtil.java (98%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/PinyinUtil.java (99%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/QrCodeUtil.java (99%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/ReflectUtil.java (98%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/ReflectionUtil.java (99%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/ResultUtil.java (94%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/SnowflakeIdFactoryUtil.java (90%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/SortUtil.java (99%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/StringUtil.java (99%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/TreeUtil.java (98%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/WildcardUtil.java (97%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/dynamic/CharSequenceJavaFileObject.java (94%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/dynamic/ClassFileManager.java (95%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/dynamic/DynaCompTest.java (94%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/dynamic/DynamicBean.java (98%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/dynamic/DynamicBeanUtil.java (95%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/dynamic/DynamicClassLoader.java (93%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/dynamic/DynamicEngine.java (99%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/dynamic/JavaClassObject.java (95%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/vo/AliBaBaMapVoResp.java (85%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/vo/AmapVoResp.java (85%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/vo/BaiDuMapVoResp.java (96%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/vo/EcdsaVo.java (96%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/vo/LocationVo.java (92%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/vo/Menu.java (91%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/vo/ReflectVo.java (97%) rename frame-common/src/main/java/com/lvmoney/common/{utils => util}/vo/ResultData.java (92%) rename frame-jwt-support/src/main/java/com/lvmoney/jwt/{annotations => annotation}/NotToken.java (89%) rename frame-jwt-support/src/main/java/com/lvmoney/jwt/{utils => util}/FilterMapUtil.java (90%) rename frame-jwt-support/src/main/java/com/lvmoney/jwt/{utils => util}/JwtUtil.java (91%) rename frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/{utils => util}/ExecCmdResult.java (85%) rename frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/{utils => util}/PomUtil.java (95%) rename frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/{utils => util}/Ssh2Util.java (96%) rename frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/{utils => util}/YamlUtil.java (94%) rename frame-kafka-support/src/main/java/com/lvmoney/kafka/{annotations => annotation}/DynamicService.java (90%) rename frame-log-support/src/main/java/com/lvmoney/log/{annotations => annotation}/ControllerLog.java (96%) rename frame-log-support/src/main/java/com/lvmoney/log/{annotations => annotation}/NotLog.java (85%) rename frame-log-support/src/main/java/com/lvmoney/log/{annotations => annotation}/ServiceLog.java (92%) rename frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/{utils => util}/EncryptPwdUtil.java (97%) rename frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/{utils => util}/MapperGenerator.java (98%) rename frame-office-support/src/main/java/com/lvmoney/office/{utils => util}/DocxUtil.java (99%) rename frame-office-support/src/main/java/com/lvmoney/office/{utils => util}/ExcelUtil.java (97%) rename frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/{annotations => annotation}/DynamicService.java (88%) rename frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/{utils => util}/ContextBeanUtil.java (88%) rename frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/{annotations => annotation}/DynamicService.java (92%) rename frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/{annotations => annotation}/package-info.java (84%) rename frame-router-support/src/main/java/com/lvmoney/router/{annotations => annotation}/AuthenticationValidated.java (88%) rename frame-router-support/src/main/java/com/lvmoney/router/{annotations => annotation}/ParamValidated.java (88%) rename frame-router-support/src/main/java/com/lvmoney/router/{annotations => annotation}/PermissionValidated.java (88%) rename frame-router-support/src/main/java/com/lvmoney/router/{annotations => annotation}/RouterMethod.java (93%) rename frame-router-support/src/main/java/com/lvmoney/router/{annotations => annotation}/RouterService.java (92%) rename frame-router-support/src/main/java/com/lvmoney/router/{annotations => annotation}/package-info.java (85%) rename frame-shiro-support/src/main/java/com/lvmoney/shiro/{annotations => annotation}/ShiroResouce.java (95%) rename frame-shiro-support/src/main/java/com/lvmoney/shiro/{utils => util}/FilterMapUtil.java (87%) rename frame-shiro-support/src/main/java/com/lvmoney/shiro/{utils => util}/RequestUtils.java (95%) diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/constant/ActivitiConstant.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/constant/ActivitiConstant.java index 9dd092d..4794545 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/constant/ActivitiConstant.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/constant/ActivitiConstant.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.constant;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/31 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/controller/BaseController.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/controller/BaseController.java index 6c89440..279e39d 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/controller/BaseController.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/controller/BaseController.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.controller;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 @@ -10,7 +10,7 @@ package com.lvmoney.activiti.controller;/** import com.lvmoney.activiti.po.User; import com.lvmoney.activiti.po.VacationForm; import com.lvmoney.activiti.service.MiaoService; -import com.lvmoney.activiti.utils.ResultInfo; +import com.lvmoney.activiti.util.ResultInfo; import com.lvmoney.common.constant.CommonConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -76,7 +76,7 @@ public class BaseController { /** * @describe: 添加请假单 * @param: [request] - * @return: com.lvmoney.activiti.utils.ResultInfo + * @return: com.lvmoney.activiti.util.ResultInfo * @author: lvmoney /XXXXXX科技有限公司 * 2019/9/9 9:59 */ @@ -96,7 +96,7 @@ public class BaseController { /** * @describe: 申请者放弃请假 * @param: [request] - * @return: com.lvmoney.activiti.utils.ResultInfo + * @return: com.lvmoney.activiti.util.ResultInfo * @author: lvmoney /XXXXXX科技有限公司 * 2019/9/9 9:59 */ @@ -114,7 +114,7 @@ public class BaseController { /** * @describe: 申请者申请请假 * @param: [request] - * @return: com.lvmoney.activiti.utils.ResultInfo + * @return: com.lvmoney.activiti.util.ResultInfo * @author: lvmoney /XXXXXX科技有限公司 * 2019/9/9 9:59 */ @@ -132,7 +132,7 @@ public class BaseController { /** * @describe: 审批者审核请假信息 * @param: [request] - * @return: com.lvmoney.activiti.utils.ResultInfo + * @return: com.lvmoney.activiti.util.ResultInfo * @author: lvmoney /XXXXXX科技有限公司 * 2019/9/9 10:00 */ @@ -165,7 +165,7 @@ public class BaseController { /** * @describe: 历史状态查询 * @param: [request] - * @return: com.lvmoney.activiti.utils.ResultInfo + * @return: com.lvmoney.activiti.util.ResultInfo * @author: lvmoney /XXXXXX科技有限公司 * 2019/9/9 10:00 */ diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/dao/UserMapper.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/dao/UserMapper.java index a432f40..e9f8d6b 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/dao/UserMapper.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/dao/UserMapper.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.dao;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/dao/VacationFormMapper.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/dao/VacationFormMapper.java index 2d9556a..724056e 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/dao/VacationFormMapper.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/dao/VacationFormMapper.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.dao;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/delegate/ServiceTask.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/delegate/ServiceTask.java index 4e56c87..ea3aacb 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/delegate/ServiceTask.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/delegate/ServiceTask.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.delegate;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/31 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/listener/CountersignListener.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/listener/CountersignListener.java index 1c6a04f..ab12870 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/listener/CountersignListener.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/listener/CountersignListener.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.listener;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/23 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/AccountService.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/AccountService.java index fb6421b..a28fc1a 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/AccountService.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/AccountService.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.service;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/24 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/BaseActivitiService.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/BaseActivitiService.java index ff7675e..12ff109 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/BaseActivitiService.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/BaseActivitiService.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.service;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/23 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/BaseActivitiServiceImpl.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/BaseActivitiServiceImpl.java index 5cb86f4..26c3093 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/BaseActivitiServiceImpl.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/BaseActivitiServiceImpl.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.service.impl;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/23 * Copyright xxxx科技有限公司 @@ -9,8 +9,7 @@ package com.lvmoney.activiti.service.impl;/** import com.lvmoney.activiti.service.BaseActivitiService; import com.lvmoney.activiti.vo.*; -import com.lvmoney.common.utils.JsonUtil; -import com.lvmoney.common.utils.ModuleUtil; +import com.lvmoney.common.util.JsonUtil; import org.activiti.bpmn.model.FlowNode; import org.activiti.bpmn.model.Process; import org.activiti.engine.*; diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/DeleteTaskCmd.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/DeleteTaskCmd.java index c69cd80..a39cc5d 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/DeleteTaskCmd.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/DeleteTaskCmd.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.service.impl;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/31 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/SetFlowNodeAndGoCmd.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/SetFlowNodeAndGoCmd.java index 6d1cc89..5918627 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/SetFlowNodeAndGoCmd.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/service/impl/SetFlowNodeAndGoCmd.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.service.impl;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/31 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/utils/ResultInfo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/util/ResultInfo.java similarity index 96% rename from frame-activiti-support/src/main/java/com/lvmoney/activiti/utils/ResultInfo.java rename to frame-activiti-support/src/main/java/com/lvmoney/activiti/util/ResultInfo.java index 08457ee..d4b555c 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/utils/ResultInfo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/util/ResultInfo.java @@ -1,4 +1,4 @@ -package com.lvmoney.activiti.utils; +package com.lvmoney.activiti.util; /** * @describe：返回解开过信息类 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/ApprovalUser.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/ApprovalUser.java index d6ee5c4..fe7e16e 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/ApprovalUser.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/ApprovalUser.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/23 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/AssigneeVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/AssigneeVo.java index 412374e..de408c9 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/AssigneeVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/AssigneeVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/31 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/CompleteTaskVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/CompleteTaskVo.java index c82b20d..b51a87f 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/CompleteTaskVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/CompleteTaskVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.activiti.vo * 版本信息: 版本1.0 * 日期:2019/1/29 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/CountersignUser.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/CountersignUser.java index f2c6d88..925c085 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/CountersignUser.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/CountersignUser.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/23 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/DelegateVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/DelegateVo.java index b4f8867..9a34a9f 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/DelegateVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/DelegateVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/31 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/HistoryVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/HistoryVo.java index 20b5460..69cb764 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/HistoryVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/HistoryVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/29 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/ImgVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/ImgVo.java index 11294bd..f6c0374 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/ImgVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/ImgVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/29 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/JumpReasonVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/JumpReasonVo.java index cd2a7d5..1477efa 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/JumpReasonVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/JumpReasonVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/31 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/JumpVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/JumpVo.java index 539b4d5..4cbe1b1 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/JumpVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/JumpVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/31 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/QueryTaskVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/QueryTaskVo.java index 4f5b7e4..499c14f 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/QueryTaskVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/QueryTaskVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/29 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/RevokeVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/RevokeVo.java index 741ae0b..fa68c79 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/RevokeVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/RevokeVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/31 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/StartProcessVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/StartProcessVo.java index 3f3ddbe..b319211 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/StartProcessVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/StartProcessVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/29 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/UserVo.java b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/UserVo.java index 90135cd..c835319 100644 --- a/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/UserVo.java +++ b/frame-activiti-support/src/main/java/com/lvmoney/activiti/vo/UserVo.java @@ -1,6 +1,6 @@ package com.lvmoney.activiti.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/24 * Copyright xxxx科技有限公司 diff --git a/frame-activiti-support/src/test/java/ActivitiTest.java b/frame-activiti-support/src/test/java/ActivitiTest.java index 49f3f28..a9bd037 100644 --- a/frame-activiti-support/src/test/java/ActivitiTest.java +++ b/frame-activiti-support/src/test/java/ActivitiTest.java @@ -1,6 +1,6 @@ /** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/24 * Copyright xxxx科技有限公司 @@ -16,7 +16,7 @@ import com.lvmoney.activiti.service.BaseActivitiService; import com.lvmoney.activiti.service.MiaoService; import com.lvmoney.activiti.vo.*; import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import org.activiti.engine.HistoryService; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; diff --git a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/application/CanalRedisApplication.java b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/application/CanalRedisApplication.java index 1f004ee..11b6459 100644 --- a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/application/CanalRedisApplication.java +++ b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/application/CanalRedisApplication.java @@ -9,7 +9,7 @@ import com.alibaba.otter.canal.protocol.CanalEntry.EventType; import com.alibaba.otter.canal.protocol.CanalEntry.RowChange; import com.alibaba.otter.canal.protocol.CanalEntry.RowData; import com.alibaba.otter.canal.client.*; -import com.lvmoney.common.utils.MapUtil; +import com.lvmoney.common.util.MapUtil; import java.net.InetSocketAddress; import java.util.HashMap; diff --git a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/client/AbstractCanalClient.java b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/client/AbstractCanalClient.java index 16e3a26..7fdbd91 100644 --- a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/client/AbstractCanalClient.java +++ b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/client/AbstractCanalClient.java @@ -2,20 +2,17 @@ package com.lvmoney.bigdata.canal.redis.client; import com.alibaba.otter.canal.client.CanalConnector; import com.alibaba.otter.canal.client.CanalConnectors; -import com.alibaba.otter.canal.protocol.exception.CanalClientException; import com.lvmoney.bigdata.canal.redis.properties.CanalProp; import com.lvmoney.bigdata.canal.redis.transfer.DefaultMessageTransponder; import com.lvmoney.bigdata.canal.redis.transfer.TransponderFactory; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.net.InetSocketAddress; import java.util.Map; -import java.util.Objects; /** * @describe：Canal 客户端抽象类 diff --git a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/service/impl/AbstractCanal2RedisServiceImpl.java b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/service/impl/AbstractCanal2RedisServiceImpl.java index 725d4c5..297a3ec 100644 --- a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/service/impl/AbstractCanal2RedisServiceImpl.java +++ b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/service/impl/AbstractCanal2RedisServiceImpl.java @@ -3,12 +3,10 @@ package com.lvmoney.bigdata.canal.redis.service.impl; import com.alibaba.otter.canal.protocol.CanalEntry; import com.lvmoney.bigdata.canal.redis.service.Canal2RedisService; import com.lvmoney.bigdata.canal.redis.vo.DbMsgVo; -import com.lvmoney.common.utils.BeanUtil; -import com.lvmoney.common.utils.MapUtil; +import com.lvmoney.common.util.MapUtil; import com.lvmoney.common.vo.Page; import com.lvmoney.redis.service.BaseRedisService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import java.util.*; import java.util.concurrent.atomic.AtomicReference; diff --git a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/transfer/AbstractMessageTransponder.java b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/transfer/AbstractMessageTransponder.java index aaa648a..dc3c016 100644 --- a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/transfer/AbstractMessageTransponder.java +++ b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/transfer/AbstractMessageTransponder.java @@ -6,15 +6,14 @@ import com.alibaba.otter.canal.protocol.exception.CanalClientException; import com.lvmoney.bigdata.canal.redis.annotation.CanalEventListener; import com.lvmoney.bigdata.canal.redis.vo.ListenerPointVo; import com.lvmoney.bigdata.canal.redis.properties.CanalProp; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Objects; /** * @describe： diff --git a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/transfer/DefaultMessageTransponder.java b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/transfer/DefaultMessageTransponder.java index ab17dab..6b78beb 100644 --- a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/transfer/DefaultMessageTransponder.java +++ b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/transfer/DefaultMessageTransponder.java @@ -9,8 +9,8 @@ import com.lvmoney.bigdata.canal.redis.annotation.ListenPoint; import com.lvmoney.bigdata.canal.redis.vo.DbMsgVo; import com.lvmoney.bigdata.canal.redis.vo.ListenerPointVo; import com.lvmoney.bigdata.canal.redis.properties.CanalProp; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.CollectionUtils; diff --git a/frame-captcha-support/src/main/java/com/lvmoney/captcha/service/impl/CaptchaServiceImpl.java b/frame-captcha-support/src/main/java/com/lvmoney/captcha/service/impl/CaptchaServiceImpl.java index 02d7dc2..b53c10c 100644 --- a/frame-captcha-support/src/main/java/com/lvmoney/captcha/service/impl/CaptchaServiceImpl.java +++ b/frame-captcha-support/src/main/java/com/lvmoney/captcha/service/impl/CaptchaServiceImpl.java @@ -14,11 +14,11 @@ import com.lvmoney.captcha.ro.ValidateCodeRo; import com.lvmoney.captcha.service.CaptchaService; import com.lvmoney.captcha.vo.ValidateCodeVo; import com.lvmoney.captcha.vo.ValidateResultVo; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.utils.FileUtil; -import com.lvmoney.common.utils.JsonUtil; -import com.lvmoney.common.utils.SnowflakeIdFactoryUtil; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.common.util.FileUtil; +import com.lvmoney.common.util.JsonUtil; +import com.lvmoney.common.util.SnowflakeIdFactoryUtil; import com.lvmoney.redis.service.BaseRedisService; import com.revengemission.commons.captcha.core.VerificationCodeUtil; import org.slf4j.Logger; diff --git a/frame-common/src/main/java/com/lvmoney/common/exceptions/BusinessException.java b/frame-common/src/main/java/com/lvmoney/common/exception/BusinessException.java similarity index 98% rename from frame-common/src/main/java/com/lvmoney/common/exceptions/BusinessException.java rename to frame-common/src/main/java/com/lvmoney/common/exception/BusinessException.java index 8d04c21..f84cfd8 100644 --- a/frame-common/src/main/java/com/lvmoney/common/exceptions/BusinessException.java +++ b/frame-common/src/main/java/com/lvmoney/common/exception/BusinessException.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.exceptions; +package com.lvmoney.common.exception; import org.springframework.util.StringUtils; diff --git a/frame-common/src/main/java/com/lvmoney/common/exceptions/CommonException.java b/frame-common/src/main/java/com/lvmoney/common/exception/CommonException.java similarity index 99% rename from frame-common/src/main/java/com/lvmoney/common/exceptions/CommonException.java rename to frame-common/src/main/java/com/lvmoney/common/exception/CommonException.java index f875c30..819f841 100644 --- a/frame-common/src/main/java/com/lvmoney/common/exceptions/CommonException.java +++ b/frame-common/src/main/java/com/lvmoney/common/exception/CommonException.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.exceptions; +package com.lvmoney.common.exception; /** * @describe：路由错误码定义接口 diff --git a/frame-common/src/main/java/com/lvmoney/common/exceptions/ExceptionType.java b/frame-common/src/main/java/com/lvmoney/common/exception/ExceptionType.java similarity index 94% rename from frame-common/src/main/java/com/lvmoney/common/exceptions/ExceptionType.java rename to frame-common/src/main/java/com/lvmoney/common/exception/ExceptionType.java index 7cf90f4..e16db11 100644 --- a/frame-common/src/main/java/com/lvmoney/common/exceptions/ExceptionType.java +++ b/frame-common/src/main/java/com/lvmoney/common/exception/ExceptionType.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.exceptions; +package com.lvmoney.common.exception; /** * @describe：业务异常类型顶层接口,推荐使用枚举来进行实现 diff --git a/frame-common/src/main/java/com/lvmoney/common/exceptions/FrameRuntimeException.java b/frame-common/src/main/java/com/lvmoney/common/exception/FrameRuntimeException.java similarity index 96% rename from frame-common/src/main/java/com/lvmoney/common/exceptions/FrameRuntimeException.java rename to frame-common/src/main/java/com/lvmoney/common/exception/FrameRuntimeException.java index 9cb6b77..74cfcb4 100644 --- a/frame-common/src/main/java/com/lvmoney/common/exceptions/FrameRuntimeException.java +++ b/frame-common/src/main/java/com/lvmoney/common/exception/FrameRuntimeException.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.exceptions; +package com.lvmoney.common.exception; /** * @describe： diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/ApplicationBeanUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/ApplicationBeanUtil.java similarity index 97% rename from frame-common/src/main/java/com/lvmoney/common/utils/ApplicationBeanUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/ApplicationBeanUtil.java index 42fe8cf..7543e85 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/ApplicationBeanUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/ApplicationBeanUtil.java @@ -1,7 +1,7 @@ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; /** * 描述: - * 包名:com.lvmoney.common.utils + * 包名:com.lvmoney.common.util * 版本信息: 版本1.0 * 日期:2019/2/28 * Copyright xxxx科技有限公司 diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/Base64Util.java b/frame-common/src/main/java/com/lvmoney/common/util/Base64Util.java similarity index 93% rename from frame-common/src/main/java/com/lvmoney/common/utils/Base64Util.java rename to frame-common/src/main/java/com/lvmoney/common/util/Base64Util.java index e3d69f3..7e6b97d 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/Base64Util.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/Base64Util.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils;/** +package com.lvmoney.common.util;/** * 描述: * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 @@ -6,8 +6,8 @@ package com.lvmoney.common.utils;/** * Copyright xxxx科技有限公司 */ -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/BeanUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/BeanUtil.java similarity index 97% rename from frame-common/src/main/java/com/lvmoney/common/utils/BeanUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/BeanUtil.java index 648f4a2..0080589 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/BeanUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/BeanUtil.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils;/** +package com.lvmoney.common.util;/** * 描述: * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 @@ -9,9 +9,9 @@ package com.lvmoney.common.utils;/** import com.alibaba.fastjson.JSON; import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.utils.vo.EcdsaVo; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.common.util.vo.EcdsaVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cglib.beans.BeanMap; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/DateUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/DateUtil.java similarity index 94% rename from frame-common/src/main/java/com/lvmoney/common/utils/DateUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/DateUtil.java index 618f481..a249734 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/DateUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/DateUtil.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import java.util.Calendar; import java.util.Date; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/EcdsaUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/EcdsaUtil.java similarity index 98% rename from frame-common/src/main/java/com/lvmoney/common/utils/EcdsaUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/EcdsaUtil.java index a347299..35e287a 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/EcdsaUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/EcdsaUtil.java @@ -1,6 +1,6 @@ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; -import com.lvmoney.common.utils.vo.EcdsaVo; +import com.lvmoney.common.util.vo.EcdsaVo; import org.apache.commons.codec.binary.Hex; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/FileUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/FileUtil.java similarity index 97% rename from frame-common/src/main/java/com/lvmoney/common/utils/FileUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/FileUtil.java index ce26c71..a0a67a0 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/FileUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/FileUtil.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils;/** +package com.lvmoney.common.util;/** * 描述: * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 @@ -7,8 +7,8 @@ package com.lvmoney.common.utils;/** */ -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/IntervalUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/IntervalUtil.java similarity index 98% rename from frame-common/src/main/java/com/lvmoney/common/utils/IntervalUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/IntervalUtil.java index d0489b8..13a5f5f 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/IntervalUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/IntervalUtil.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.hotel.utils + * 包名:com.lvmoney.hotel.util * 版本信息: 版本1.0 * 日期:2018年11月23日 上午10:17:17 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import com.lvmoney.common.constant.CommonConstant; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/IpUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/IpUtil.java similarity index 98% rename from frame-common/src/main/java/com/lvmoney/common/utils/IpUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/IpUtil.java index 0279637..c09417f 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/IpUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/IpUtil.java @@ -1,6 +1,6 @@ -package com.lvmoney.common.utils;/** +package com.lvmoney.common.util;/** * 描述: - * 包名:com.lvmoney.common.utils + * 包名:com.lvmoney.common.util * 版本信息: 版本1.0 * 日期:2019/8/20 * Copyright XXXXXX科技有限公司 diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/JacksonUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/JacksonUtil.java similarity index 98% rename from frame-common/src/main/java/com/lvmoney/common/utils/JacksonUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/JacksonUtil.java index bee3fe1..d7d0e2c 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/JacksonUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/JacksonUtil.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/JsonUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/JsonUtil.java similarity index 99% rename from frame-common/src/main/java/com/lvmoney/common/utils/JsonUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/JsonUtil.java index d749ce8..15e4925 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/JsonUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/JsonUtil.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import com.alibaba.fastjson.JSON; import com.fasterxml.jackson.core.JsonParser; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/ListUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/ListUtil.java similarity index 88% rename from frame-common/src/main/java/com/lvmoney/common/utils/ListUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/ListUtil.java index f2ffbdb..502a52e 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/ListUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/ListUtil.java @@ -1,15 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.hotel.utils + * 包名:com.lvmoney.hotel.util * 版本信息: 版本1.0 * 日期:2018年11月16日 下午3:02:01 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +package com.lvmoney.common.util; import java.util.ArrayList; import java.util.Collection; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/LocationUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/LocationUtil.java similarity index 98% rename from frame-common/src/main/java/com/lvmoney/common/utils/LocationUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/LocationUtil.java index a628735..1da0c99 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/LocationUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/LocationUtil.java @@ -6,7 +6,7 @@ * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import java.io.BufferedReader; import java.io.IOException; @@ -23,8 +23,8 @@ import org.slf4j.LoggerFactory; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.utils.vo.BaiDuMapVoResp; -import com.lvmoney.common.utils.vo.LocationVo; +import com.lvmoney.common.util.vo.BaiDuMapVoResp; +import com.lvmoney.common.util.vo.LocationVo; /** * @describe： diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/MapUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/MapUtil.java similarity index 86% rename from frame-common/src/main/java/com/lvmoney/common/utils/MapUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/MapUtil.java index 6de0a87..bc14119 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/MapUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/MapUtil.java @@ -1,6 +1,6 @@ -package com.lvmoney.common.utils;/** +package com.lvmoney.common.util;/** * 描述: - * 包名:com.lvmoney.common.utils + * 包名:com.lvmoney.common.util * 版本信息: 版本1.0 * 日期:2019/9/7 * Copyright XXXXXX科技有限公司 diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/ModuleUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/ModuleUtil.java similarity index 88% rename from frame-common/src/main/java/com/lvmoney/common/utils/ModuleUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/ModuleUtil.java index 77fa002..1e77bb5 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/ModuleUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/ModuleUtil.java @@ -1,14 +1,14 @@ -package com.lvmoney.common.utils;/** +package com.lvmoney.common.util;/** * 描述: - * 包名:com.lvmoney.k8s.base.utils + * 包名:com.lvmoney.k8s.base.util * 版本信息: 版本1.0 * 日期:2019/9/19 * Copyright XXXXXX科技有限公司 */ -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.ResourceUtils; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/ObjectSerializerUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/ObjectSerializerUtil.java similarity index 97% rename from frame-common/src/main/java/com/lvmoney/common/utils/ObjectSerializerUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/ObjectSerializerUtil.java index 9670111..9eacbda 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/ObjectSerializerUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/ObjectSerializerUtil.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/PhotoUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/PhotoUtil.java similarity index 98% rename from frame-common/src/main/java/com/lvmoney/common/utils/PhotoUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/PhotoUtil.java index 2f02719..aa17cdc 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/PhotoUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/PhotoUtil.java @@ -1,6 +1,6 @@ -package com.lvmoney.common.utils;/** +package com.lvmoney.common.util;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/PinyinUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/PinyinUtil.java similarity index 99% rename from frame-common/src/main/java/com/lvmoney/common/utils/PinyinUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/PinyinUtil.java index 9f17f45..1d05de5 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/PinyinUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/PinyinUtil.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import com.lvmoney.common.constant.CommonConstant; import net.sourceforge.pinyin4j.PinyinHelper; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/QrCodeUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/QrCodeUtil.java similarity index 99% rename from frame-common/src/main/java/com/lvmoney/common/utils/QrCodeUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/QrCodeUtil.java index 48556c6..dac8c65 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/QrCodeUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/QrCodeUtil.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.router.utils + * 包名:com.lvmoney.router.util * 版本信息: 版本1.0 * 日期:2018年12月29日 下午5:32:07 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import com.lvmoney.common.constant.CommonConstant; import org.slf4j.Logger; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/ReflectUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/ReflectUtil.java similarity index 98% rename from frame-common/src/main/java/com/lvmoney/common/utils/ReflectUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/ReflectUtil.java index 7b6e5da..863169c 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/ReflectUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/ReflectUtil.java @@ -1,15 +1,15 @@ /** * 描述: - * 包名:com.lvmoney.pay.utils + * 包名:com.lvmoney.pay.util * 版本信息: 版本1.0 * 日期:2018年10月10日 上午9:20:08 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.utils.vo.ReflectVo; +import com.lvmoney.common.util.vo.ReflectVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/ReflectionUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/ReflectionUtil.java similarity index 99% rename from frame-common/src/main/java/com/lvmoney/common/utils/ReflectionUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/ReflectionUtil.java index 923d146..753b8e8 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/ReflectionUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/ReflectionUtil.java @@ -5,7 +5,7 @@ * @author LeeBing /音泰思计算机技术(成都)有限公司 * Aug 19, 2014 3:25:33 PM */ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/ResultUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/ResultUtil.java similarity index 94% rename from frame-common/src/main/java/com/lvmoney/common/utils/ResultUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/ResultUtil.java index 5f3ad85..12928c6 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/ResultUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/ResultUtil.java @@ -1,8 +1,8 @@ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import java.time.Instant; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.vo.ResultData; /** * @describe： diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/SnowflakeIdFactoryUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/SnowflakeIdFactoryUtil.java similarity index 90% rename from frame-common/src/main/java/com/lvmoney/common/utils/SnowflakeIdFactoryUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/SnowflakeIdFactoryUtil.java index b3e0665..dbf15ae 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/SnowflakeIdFactoryUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/SnowflakeIdFactoryUtil.java @@ -1,22 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.pay.utils + * 包名:com.lvmoney.pay.util * 版本信息: 版本1.0 * 日期:2018年10月9日 下午5:26:20 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils; - -import com.lvmoney.common.constant.CommonConstant; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CountDownLatch; +package com.lvmoney.common.util; /** * @describe：Twitter-snowflake 实现 diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/SortUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/SortUtil.java similarity index 99% rename from frame-common/src/main/java/com/lvmoney/common/utils/SortUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/SortUtil.java index fa96dda..045c68e 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/SortUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/SortUtil.java @@ -6,7 +6,7 @@ * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; /** * @describe： diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/StringUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/StringUtil.java similarity index 99% rename from frame-common/src/main/java/com/lvmoney/common/utils/StringUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/StringUtil.java index 647a4ce..74e6bda 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/StringUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/StringUtil.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.hotel.utils + * 包名:com.lvmoney.hotel.util * 版本信息: 版本1.0 * 日期:2018年12月4日 下午1:57:49 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import org.apache.commons.lang3.StringUtils; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/TreeUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/TreeUtil.java similarity index 98% rename from frame-common/src/main/java/com/lvmoney/common/utils/TreeUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/TreeUtil.java index 61eb381..ee34353 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/TreeUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/TreeUtil.java @@ -1,10 +1,10 @@ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.common.service.ITree; -import com.lvmoney.common.utils.vo.Menu; +import com.lvmoney.common.util.vo.Menu; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/WildcardUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/WildcardUtil.java similarity index 97% rename from frame-common/src/main/java/com/lvmoney/common/utils/WildcardUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/WildcardUtil.java index 3a9666b..86da84f 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/WildcardUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/WildcardUtil.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.common.utils + * 包名:com.lvmoney.common.util * 版本信息: 版本1.0 * 日期:2019年1月10日 下午3:49:46 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils; +package com.lvmoney.common.util; import java.util.HashMap; import java.util.Map; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/CharSequenceJavaFileObject.java b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/CharSequenceJavaFileObject.java similarity index 94% rename from frame-common/src/main/java/com/lvmoney/common/utils/dynamic/CharSequenceJavaFileObject.java rename to frame-common/src/main/java/com/lvmoney/common/util/dynamic/CharSequenceJavaFileObject.java index 2251cf6..7e418dc 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/CharSequenceJavaFileObject.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/CharSequenceJavaFileObject.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils.dynamic; +package com.lvmoney.common.util.dynamic; import javax.tools.JavaFileObject; import javax.tools.SimpleJavaFileObject; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/ClassFileManager.java b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/ClassFileManager.java similarity index 95% rename from frame-common/src/main/java/com/lvmoney/common/utils/dynamic/ClassFileManager.java rename to frame-common/src/main/java/com/lvmoney/common/util/dynamic/ClassFileManager.java index afb8991..8fcc8db 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/ClassFileManager.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/ClassFileManager.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils.dynamic; +package com.lvmoney.common.util.dynamic; import java.io.IOException; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynaCompTest.java b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynaCompTest.java similarity index 94% rename from frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynaCompTest.java rename to frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynaCompTest.java index 55a4366..9eb19cd 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynaCompTest.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynaCompTest.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils.dynamic; +package com.lvmoney.common.util.dynamic; /** * @describe： diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicBean.java b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicBean.java similarity index 98% rename from frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicBean.java rename to frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicBean.java index 6ef383c..b3c7852 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicBean.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicBean.java @@ -5,7 +5,7 @@ * @author LeeBing /音泰思计算机技术(成都)有限公司 * Aug 19, 2014 3:25:33 PM */ -package com.lvmoney.common.utils.dynamic; +package com.lvmoney.common.util.dynamic; import org.springframework.cglib.beans.BeanGenerator; import org.springframework.cglib.beans.BeanMap; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicBeanUtil.java b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicBeanUtil.java similarity index 95% rename from frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicBeanUtil.java rename to frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicBeanUtil.java index 6e102df..ce1e46b 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicBeanUtil.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicBeanUtil.java @@ -5,9 +5,9 @@ * @author LeeBing /音泰思计算机技术(成都)有限公司 * Aug 19, 2014 3:25:33 PM */ -package com.lvmoney.common.utils.dynamic; +package com.lvmoney.common.util.dynamic; -import com.lvmoney.common.utils.MapUtil; +import com.lvmoney.common.util.MapUtil; import java.util.Collection; import java.util.HashMap; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicClassLoader.java b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicClassLoader.java similarity index 93% rename from frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicClassLoader.java rename to frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicClassLoader.java index 143a20d..590b728 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicClassLoader.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicClassLoader.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils.dynamic; +package com.lvmoney.common.util.dynamic; import java.net.URLClassLoader; import java.net.URL; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicEngine.java b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicEngine.java similarity index 99% rename from frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicEngine.java rename to frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicEngine.java index 4c8c360..9c4e5bf 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/DynamicEngine.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/DynamicEngine.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils.dynamic; +package com.lvmoney.common.util.dynamic; import java.io.File; import java.net.URL; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/JavaClassObject.java b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/JavaClassObject.java similarity index 95% rename from frame-common/src/main/java/com/lvmoney/common/utils/dynamic/JavaClassObject.java rename to frame-common/src/main/java/com/lvmoney/common/util/dynamic/JavaClassObject.java index 770eab3..80b3750 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/dynamic/JavaClassObject.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/dynamic/JavaClassObject.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils.dynamic; +package com.lvmoney.common.util.dynamic; import javax.tools.JavaFileObject; import javax.tools.SimpleJavaFileObject; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/vo/AliBaBaMapVoResp.java b/frame-common/src/main/java/com/lvmoney/common/util/vo/AliBaBaMapVoResp.java similarity index 85% rename from frame-common/src/main/java/com/lvmoney/common/utils/vo/AliBaBaMapVoResp.java rename to frame-common/src/main/java/com/lvmoney/common/util/vo/AliBaBaMapVoResp.java index bbbb377..079660e 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/vo/AliBaBaMapVoResp.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/vo/AliBaBaMapVoResp.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.hotel.utils.ro + * 包名:com.lvmoney.hotel.util.ro * 版本信息: 版本1.0 * 日期:2018年11月8日 下午5:39:40 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils.vo; +package com.lvmoney.common.util.vo; import java.io.Serializable; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/vo/AmapVoResp.java b/frame-common/src/main/java/com/lvmoney/common/util/vo/AmapVoResp.java similarity index 85% rename from frame-common/src/main/java/com/lvmoney/common/utils/vo/AmapVoResp.java rename to frame-common/src/main/java/com/lvmoney/common/util/vo/AmapVoResp.java index fc9b092..60ed7a7 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/vo/AmapVoResp.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/vo/AmapVoResp.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.hotel.utils.ro + * 包名:com.lvmoney.hotel.util.ro * 版本信息: 版本1.0 * 日期:2018年11月8日 下午5:38:53 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils.vo; +package com.lvmoney.common.util.vo; import java.io.Serializable; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/vo/BaiDuMapVoResp.java b/frame-common/src/main/java/com/lvmoney/common/util/vo/BaiDuMapVoResp.java similarity index 96% rename from frame-common/src/main/java/com/lvmoney/common/utils/vo/BaiDuMapVoResp.java rename to frame-common/src/main/java/com/lvmoney/common/util/vo/BaiDuMapVoResp.java index 9913512..d3ded57 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/vo/BaiDuMapVoResp.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/vo/BaiDuMapVoResp.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.hotel.utils.ro + * 包名:com.lvmoney.hotel.util.ro * 版本信息: 版本1.0 * 日期:2018年11月8日 下午5:39:19 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils.vo; +package com.lvmoney.common.util.vo; import java.io.Serializable; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/vo/EcdsaVo.java b/frame-common/src/main/java/com/lvmoney/common/util/vo/EcdsaVo.java similarity index 96% rename from frame-common/src/main/java/com/lvmoney/common/utils/vo/EcdsaVo.java rename to frame-common/src/main/java/com/lvmoney/common/util/vo/EcdsaVo.java index 114b3f8..3dd9ae5 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/vo/EcdsaVo.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/vo/EcdsaVo.java @@ -6,7 +6,7 @@ * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils.vo; +package com.lvmoney.common.util.vo; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/vo/LocationVo.java b/frame-common/src/main/java/com/lvmoney/common/util/vo/LocationVo.java similarity index 92% rename from frame-common/src/main/java/com/lvmoney/common/utils/vo/LocationVo.java rename to frame-common/src/main/java/com/lvmoney/common/util/vo/LocationVo.java index ee8abec..2daab73 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/vo/LocationVo.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/vo/LocationVo.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.common.utils.ro + * 包名:com.lvmoney.common.util.ro * 版本信息: 版本1.0 * 日期:2018年11月6日 下午2:23:16 * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils.vo; +package com.lvmoney.common.util.vo; import java.io.Serializable; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/vo/Menu.java b/frame-common/src/main/java/com/lvmoney/common/util/vo/Menu.java similarity index 91% rename from frame-common/src/main/java/com/lvmoney/common/utils/vo/Menu.java rename to frame-common/src/main/java/com/lvmoney/common/util/vo/Menu.java index e3b2525..eb3bb1a 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/vo/Menu.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/vo/Menu.java @@ -1,4 +1,4 @@ -package com.lvmoney.common.utils.vo; +package com.lvmoney.common.util.vo; import lombok.Data; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/vo/ReflectVo.java b/frame-common/src/main/java/com/lvmoney/common/util/vo/ReflectVo.java similarity index 97% rename from frame-common/src/main/java/com/lvmoney/common/utils/vo/ReflectVo.java rename to frame-common/src/main/java/com/lvmoney/common/util/vo/ReflectVo.java index 6667b4f..d302876 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/vo/ReflectVo.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/vo/ReflectVo.java @@ -6,7 +6,7 @@ * Copyright xxxx科技有限公司 */ -package com.lvmoney.common.utils.vo; +package com.lvmoney.common.util.vo; import java.io.Serializable; diff --git a/frame-common/src/main/java/com/lvmoney/common/utils/vo/ResultData.java b/frame-common/src/main/java/com/lvmoney/common/util/vo/ResultData.java similarity index 92% rename from frame-common/src/main/java/com/lvmoney/common/utils/vo/ResultData.java rename to frame-common/src/main/java/com/lvmoney/common/util/vo/ResultData.java index 9c82462..43c269a 100644 --- a/frame-common/src/main/java/com/lvmoney/common/utils/vo/ResultData.java +++ b/frame-common/src/main/java/com/lvmoney/common/util/vo/ResultData.java @@ -1,8 +1,8 @@ -package com.lvmoney.common.utils.vo; +package com.lvmoney.common.util.vo; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.ExceptionType; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.ExceptionType; +import com.lvmoney.common.util.JsonUtil; import java.io.Serializable; import java.util.HashMap; diff --git a/frame-common/src/main/java/com/lvmoney/common/web/FrameExceptionHandlerAdvice.java b/frame-common/src/main/java/com/lvmoney/common/web/FrameExceptionHandlerAdvice.java index ff63784..6cb8a62 100644 --- a/frame-common/src/main/java/com/lvmoney/common/web/FrameExceptionHandlerAdvice.java +++ b/frame-common/src/main/java/com/lvmoney/common/web/FrameExceptionHandlerAdvice.java @@ -1,9 +1,9 @@ package com.lvmoney.common.web; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.FrameRuntimeException; -import com.lvmoney.common.utils.ResultUtil; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.FrameRuntimeException; +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.validation.BindException; diff --git a/frame-drools-support/src/main/java/com/lvmoney/drools/constant/ProductEnum.java b/frame-drools-support/src/main/java/com/lvmoney/drools/constant/ProductEnum.java index 8804b37..61b42d1 100644 --- a/frame-drools-support/src/main/java/com/lvmoney/drools/constant/ProductEnum.java +++ b/frame-drools-support/src/main/java/com/lvmoney/drools/constant/ProductEnum.java @@ -8,7 +8,7 @@ package com.lvmoney.drools.constant; -import com.lvmoney.common.utils.IntervalUtil; +import com.lvmoney.common.util.IntervalUtil; /** * @describe： diff --git a/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/controller/BaseController.java b/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/controller/BaseController.java index 06d8da5..a49f91c 100644 --- a/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/controller/BaseController.java +++ b/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/controller/BaseController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.lvmoney.common.utils.LocationUtil; +import com.lvmoney.common.util.LocationUtil; import com.lvmoney.elasticsearch.eo.Employee; import com.lvmoney.elasticsearch.service.ElasticsearchService; import com.lvmoney.elasticsearch.vo.ElasticsearchQueryVo; diff --git a/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/service/impl/ElasticsearchServiceImpl.java b/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/service/impl/ElasticsearchServiceImpl.java index f174eab..7418971 100644 --- a/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/service/impl/ElasticsearchServiceImpl.java +++ b/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/service/impl/ElasticsearchServiceImpl.java @@ -34,9 +34,9 @@ import org.springframework.data.elasticsearch.core.query.IndexQueryBuilder; import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.query.SearchQuery; import org.springframework.stereotype.Service; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.utils.vo.LocationVo; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.common.util.vo.LocationVo; import com.lvmoney.elasticsearch.service.ElasticsearchService; import com.lvmoney.elasticsearch.vo.ElasticsearchDeleteVo; import com.lvmoney.elasticsearch.vo.ElasticsearchNearbyVo; diff --git a/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/vo/ElasticsearchNearbyVo.java b/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/vo/ElasticsearchNearbyVo.java index 8662d7b..7e61af5 100644 --- a/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/vo/ElasticsearchNearbyVo.java +++ b/frame-elasticsearch-support/src/main/java/com/lvmoney/elasticsearch/vo/ElasticsearchNearbyVo.java @@ -12,7 +12,7 @@ import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.search.sort.SortOrder; import org.springframework.data.domain.Pageable; -import com.lvmoney.common.utils.vo.LocationVo; +import com.lvmoney.common.util.vo.LocationVo; /** * @param diff --git a/frame-empty-test/src/main/java/com/lvmoney/rabbitmq/annotation/package-info.java b/frame-empty-test/src/main/java/com/lvmoney/rabbitmq/annotation/package-info.java index 5cd9de7..50fc802 100644 --- a/frame-empty-test/src/main/java/com/lvmoney/rabbitmq/annotation/package-info.java +++ b/frame-empty-test/src/main/java/com/lvmoney/rabbitmq/annotation/package-info.java @@ -1,6 +1,6 @@ /** * 描述: - * 包名:com.lvmoney.rabbitmq.annotations + * 包名:com.lvmoney.rabbitmq.annotation * 版本信息: 版本1.0 * 日期:2019年1月10日 下午5:17:22 * Copyright xxxx科技有限公司 diff --git a/frame-httpclient-support/src/main/java/com/lvmoney/httpclient/service/impl/HttpApiServiceImpl.java b/frame-httpclient-support/src/main/java/com/lvmoney/httpclient/service/impl/HttpApiServiceImpl.java index 3151c0b..0b8096f 100644 --- a/frame-httpclient-support/src/main/java/com/lvmoney/httpclient/service/impl/HttpApiServiceImpl.java +++ b/frame-httpclient-support/src/main/java/com/lvmoney/httpclient/service/impl/HttpApiServiceImpl.java @@ -8,8 +8,8 @@ package com.lvmoney.httpclient.service.impl; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.httpclient.service.HttpApiService; import com.lvmoney.httpclient.vo.HttpFileResult; import com.lvmoney.httpclient.vo.HttpResult; diff --git a/frame-jwt-support/src/main/java/com/lvmoney/jwt/annotations/NotToken.java b/frame-jwt-support/src/main/java/com/lvmoney/jwt/annotation/NotToken.java similarity index 89% rename from frame-jwt-support/src/main/java/com/lvmoney/jwt/annotations/NotToken.java rename to frame-jwt-support/src/main/java/com/lvmoney/jwt/annotation/NotToken.java index 557cd20..7845043 100644 --- a/frame-jwt-support/src/main/java/com/lvmoney/jwt/annotations/NotToken.java +++ b/frame-jwt-support/src/main/java/com/lvmoney/jwt/annotation/NotToken.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019年1月4日 下午2:26:15 * Copyright xxxx科技有限公司 */ -package com.lvmoney.jwt.annotations; +package com.lvmoney.jwt.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/frame-jwt-support/src/main/java/com/lvmoney/jwt/controller/test/TestController.java b/frame-jwt-support/src/main/java/com/lvmoney/jwt/controller/test/TestController.java index 776df62..7ea17d8 100644 --- a/frame-jwt-support/src/main/java/com/lvmoney/jwt/controller/test/TestController.java +++ b/frame-jwt-support/src/main/java/com/lvmoney/jwt/controller/test/TestController.java @@ -8,9 +8,9 @@ package com.lvmoney.jwt.controller.test;/** import com.lvmoney.common.ro.UserRo; -import com.lvmoney.common.utils.JsonUtil; -import com.lvmoney.jwt.annotations.NotToken; -import com.lvmoney.jwt.utils.JwtUtil; +import com.lvmoney.common.util.JsonUtil; +import com.lvmoney.jwt.annotation.NotToken; +import com.lvmoney.jwt.util.JwtUtil; import com.lvmoney.jwt.vo.UserVo; import com.lvmoney.redis.service.BaseRedisService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/frame-jwt-support/src/main/java/com/lvmoney/jwt/interceptor/JwtInterceptor.java b/frame-jwt-support/src/main/java/com/lvmoney/jwt/interceptor/JwtInterceptor.java index 6fc96e1..81ac6bb 100644 --- a/frame-jwt-support/src/main/java/com/lvmoney/jwt/interceptor/JwtInterceptor.java +++ b/frame-jwt-support/src/main/java/com/lvmoney/jwt/interceptor/JwtInterceptor.java @@ -14,13 +14,13 @@ import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.exceptions.JWTVerificationException; import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.jwt.annotations.NotToken; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.jwt.annotation.NotToken; import com.lvmoney.jwt.constant.JwtConstant; import com.lvmoney.jwt.properties.JwtConfigProp; import com.lvmoney.jwt.service.JwtRedisService; -import com.lvmoney.jwt.utils.FilterMapUtil; +import com.lvmoney.jwt.util.FilterMapUtil; import com.lvmoney.jwt.vo.UserVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/frame-jwt-support/src/main/java/com/lvmoney/jwt/service/impl/JwtRedisServiceImpl.java b/frame-jwt-support/src/main/java/com/lvmoney/jwt/service/impl/JwtRedisServiceImpl.java index 753fb1e..6731813 100644 --- a/frame-jwt-support/src/main/java/com/lvmoney/jwt/service/impl/JwtRedisServiceImpl.java +++ b/frame-jwt-support/src/main/java/com/lvmoney/jwt/service/impl/JwtRedisServiceImpl.java @@ -15,10 +15,10 @@ import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.exceptions.JWTVerificationException; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.common.ro.UserRo; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.jwt.service.JwtRedisService; import com.lvmoney.jwt.vo.UserVo; import com.lvmoney.redis.service.BaseRedisService; diff --git a/frame-jwt-support/src/main/java/com/lvmoney/jwt/utils/FilterMapUtil.java b/frame-jwt-support/src/main/java/com/lvmoney/jwt/util/FilterMapUtil.java similarity index 90% rename from frame-jwt-support/src/main/java/com/lvmoney/jwt/utils/FilterMapUtil.java rename to frame-jwt-support/src/main/java/com/lvmoney/jwt/util/FilterMapUtil.java index b905434..a020895 100644 --- a/frame-jwt-support/src/main/java/com/lvmoney/jwt/utils/FilterMapUtil.java +++ b/frame-jwt-support/src/main/java/com/lvmoney/jwt/util/FilterMapUtil.java @@ -1,4 +1,4 @@ -package com.lvmoney.jwt.utils;/** +package com.lvmoney.jwt.util;/** * 描述: * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 @@ -6,7 +6,7 @@ package com.lvmoney.jwt.utils;/** * Copyright xxxx科技有限公司 */ -import com.lvmoney.common.utils.WildcardUtil; +import com.lvmoney.common.util.WildcardUtil; import java.util.Map; diff --git a/frame-jwt-support/src/main/java/com/lvmoney/jwt/utils/JwtUtil.java b/frame-jwt-support/src/main/java/com/lvmoney/jwt/util/JwtUtil.java similarity index 91% rename from frame-jwt-support/src/main/java/com/lvmoney/jwt/utils/JwtUtil.java rename to frame-jwt-support/src/main/java/com/lvmoney/jwt/util/JwtUtil.java index d4fb422..b2397a3 100644 --- a/frame-jwt-support/src/main/java/com/lvmoney/jwt/utils/JwtUtil.java +++ b/frame-jwt-support/src/main/java/com/lvmoney/jwt/util/JwtUtil.java @@ -1,19 +1,17 @@ /** * 描述: - * 包名:com.lvmoney.jwt.utils + * 包名:com.lvmoney.jwt.util * 版本信息: 版本1.0 * 日期:2019年1月4日 下午2:30:43 * Copyright xxxx科技有限公司 */ -package com.lvmoney.jwt.utils; +package com.lvmoney.jwt.util; import com.auth0.jwt.JWT; -import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.utils.SnowflakeIdFactoryUtil; -import com.lvmoney.jwt.constant.JwtConstant; +import com.lvmoney.common.util.SnowflakeIdFactoryUtil; import com.lvmoney.jwt.vo.UserVo; import java.time.Instant; diff --git a/frame-k8s-support/frame-authentication-support/src/main/java/com/lvmoney/k8s/authentication/controller/AuthenticationController.java b/frame-k8s-support/frame-authentication-support/src/main/java/com/lvmoney/k8s/authentication/controller/AuthenticationController.java index 63d7d17..d26e9cc 100644 --- a/frame-k8s-support/frame-authentication-support/src/main/java/com/lvmoney/k8s/authentication/controller/AuthenticationController.java +++ b/frame-k8s-support/frame-authentication-support/src/main/java/com/lvmoney/k8s/authentication/controller/AuthenticationController.java @@ -8,11 +8,11 @@ package com.lvmoney.k8s.authentication.controller;/** import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.common.ro.UserRo; -import com.lvmoney.common.utils.ResultUtil; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.jwt.service.JwtRedisService; import com.lvmoney.k8s.authentication.constant.AuthenticationConstant; import com.lvmoney.k8s.authentication.properties.OauthClientProp; diff --git a/frame-k8s-support/frame-authentication-support/src/main/java/com/lvmoney/k8s/authentication/service/AbstractOauth2LoginService.java b/frame-k8s-support/frame-authentication-support/src/main/java/com/lvmoney/k8s/authentication/service/AbstractOauth2LoginService.java index f959a96..ce91825 100644 --- a/frame-k8s-support/frame-authentication-support/src/main/java/com/lvmoney/k8s/authentication/service/AbstractOauth2LoginService.java +++ b/frame-k8s-support/frame-authentication-support/src/main/java/com/lvmoney/k8s/authentication/service/AbstractOauth2LoginService.java @@ -9,7 +9,7 @@ package com.lvmoney.k8s.authentication.service;/** import com.lvmoney.common.constant.CommonConstant; import com.lvmoney.common.ro.UserRo; -import com.lvmoney.common.utils.SnowflakeIdFactoryUtil; +import com.lvmoney.common.util.SnowflakeIdFactoryUtil; import com.lvmoney.jwt.service.JwtRedisService; import com.lvmoney.k8s.authentication.constant.AuthenticationConstant; import com.lvmoney.k8s.authentication.vo.Oauth2Token; diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/controller/DockerFileController.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/controller/DockerFileController.java index bfbb64d..994b4f9 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/controller/DockerFileController.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/controller/DockerFileController.java @@ -7,9 +7,9 @@ package com.lvmoney.k8s.base.controller;/** */ -import com.lvmoney.common.utils.ModuleUtil; -import com.lvmoney.common.utils.SnowflakeIdFactoryUtil; -import com.lvmoney.k8s.base.utils.PomUtil; +import com.lvmoney.common.util.ModuleUtil; +import com.lvmoney.common.util.SnowflakeIdFactoryUtil; +import com.lvmoney.k8s.base.util.PomUtil; import com.lvmoney.k8s.base.vo.req.DockerFileReqVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/controller/SshController.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/controller/SshController.java index c7e7ce9..6264abf 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/controller/SshController.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/controller/SshController.java @@ -8,10 +8,10 @@ package com.lvmoney.k8s.base.controller;/** import ch.ethz.ssh2.Connection; -import com.lvmoney.common.utils.ResultUtil; -import com.lvmoney.common.utils.vo.ResultData; -import com.lvmoney.k8s.base.utils.ExecCmdResult; -import com.lvmoney.k8s.base.utils.Ssh2Util; +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; +import com.lvmoney.k8s.base.util.ExecCmdResult; +import com.lvmoney.k8s.base.util.Ssh2Util; import com.lvmoney.k8s.base.vo.req.SshExecReqVo; import com.lvmoney.k8s.base.vo.req.SshUploadFileReqVo; import org.springframework.web.bind.annotation.GetMapping; @@ -31,7 +31,7 @@ public class SshController { /** * @describe:文件上传到linux指定目录 * @param: [sshUploadFileReqVo] - * @return: com.lvmoney.common.utils.vo.ResultData + * @return: com.lvmoney.common.util.vo.ResultData * @author: lvmoney /XXXXXX科技有限公司 * 2019/8/21 16:29 */ @@ -48,7 +48,7 @@ public class SshController { /** * @describe:在linux执行特定的命令行 * @param: [sshExecReqVo] - * @return: com.lvmoney.common.utils.vo.ResultData + * @return: com.lvmoney.common.util.vo.ResultData * @author: lvmoney /XXXXXX科技有限公司 * 2019/8/21 16:30 */ diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/K8sServiceImpl.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/K8sServiceImpl.java index afa20f4..4c33108 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/K8sServiceImpl.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/K8sServiceImpl.java @@ -7,8 +7,7 @@ package com.lvmoney.k8s.base.service.impl;/** */ -import com.lvmoney.common.utils.JsonUtil; -import com.lvmoney.common.utils.ReflectUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.k8s.base.service.K8sService; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.NamespaceList; diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java index a02a35a..060ae74 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java @@ -7,22 +7,19 @@ package com.lvmoney.k8s.base.service.impl;/** */ -import com.lvmoney.common.utils.JsonUtil; import com.lvmoney.k8s.base.constant.BaseConstant; import com.lvmoney.k8s.base.enums.*; import com.lvmoney.k8s.base.properties.RpcServerConfigProp; import com.lvmoney.k8s.base.service.YamlService; -import com.lvmoney.k8s.base.utils.PomUtil; -import com.lvmoney.k8s.base.utils.YamlUtil; +import com.lvmoney.k8s.base.util.PomUtil; +import com.lvmoney.k8s.base.util.YamlUtil; import com.lvmoney.k8s.base.vo.jyaml.*; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; /** diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/ExecCmdResult.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/ExecCmdResult.java similarity index 85% rename from frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/ExecCmdResult.java rename to frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/ExecCmdResult.java index 366918f..2092de4 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/ExecCmdResult.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/ExecCmdResult.java @@ -1,6 +1,6 @@ -package com.lvmoney.k8s.base.utils;/** +package com.lvmoney.k8s.base.util;/** * 描述: - * 包名:com.lvmoney.k8s.base.utils + * 包名:com.lvmoney.k8s.base.util * 版本信息: 版本1.0 * 日期:2019/8/18 * Copyright XXXXXX科技有限公司 diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/PomUtil.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/PomUtil.java similarity index 95% rename from frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/PomUtil.java rename to frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/PomUtil.java index d13d0fa..7d9f093 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/PomUtil.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/PomUtil.java @@ -1,13 +1,13 @@ -package com.lvmoney.k8s.base.utils;/** +package com.lvmoney.k8s.base.util;/** * 描述: - * 包名:com.lvmoney.k8s.base.utils + * 包名:com.lvmoney.k8s.base.util * 版本信息: 版本1.0 * 日期:2019/9/19 * Copyright XXXXXX科技有限公司 */ -import com.lvmoney.common.utils.ModuleUtil; +import com.lvmoney.common.util.ModuleUtil; import com.lvmoney.k8s.base.vo.DockerInfo; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/Ssh2Util.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/Ssh2Util.java similarity index 96% rename from frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/Ssh2Util.java rename to frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/Ssh2Util.java index 30ff4ce..11006a2 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/Ssh2Util.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/Ssh2Util.java @@ -1,22 +1,17 @@ -package com.lvmoney.k8s.base.utils;/** +package com.lvmoney.k8s.base.util;/** * 描述: - * 包名:com.lvmoney.k8s.base.utils + * 包名:com.lvmoney.k8s.base.util * 版本信息: 版本1.0 * 日期:2019/8/18 * Copyright XXXXXX科技有限公司 */ import java.io.*; -import java.nio.charset.Charset; import ch.ethz.ssh2.*; -import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.*; -import java.nio.charset.StandardCharsets; - /** * @describe： * @author: lvmoney/XXXXXX科技有限公司 diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/YamlUtil.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/YamlUtil.java similarity index 94% rename from frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/YamlUtil.java rename to frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/YamlUtil.java index 1dd6279..5b7e9c0 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/utils/YamlUtil.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/YamlUtil.java @@ -1,6 +1,6 @@ -package com.lvmoney.k8s.base.utils;/** +package com.lvmoney.k8s.base.util;/** * 描述: - * 包名:com.lvmoney.k8s.base.utils + * 包名:com.lvmoney.k8s.base.util * 版本信息: 版本1.0 * 日期:2019/8/18 * Copyright XXXXXX科技有限公司 @@ -8,7 +8,7 @@ package com.lvmoney.k8s.base.utils;/** import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.k8s.base.vo.jyaml.YamlBuild; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/frame-k8s-support/frame-base-support/src/test/java/com/lvmoney/yaml/SSHTest.java b/frame-k8s-support/frame-base-support/src/test/java/com/lvmoney/yaml/SSHTest.java index 476a5d8..5c28b7a 100644 --- a/frame-k8s-support/frame-base-support/src/test/java/com/lvmoney/yaml/SSHTest.java +++ b/frame-k8s-support/frame-base-support/src/test/java/com/lvmoney/yaml/SSHTest.java @@ -8,8 +8,8 @@ package com.lvmoney.yaml;/** import ch.ethz.ssh2.Connection; -import com.lvmoney.k8s.base.utils.ExecCmdResult; -import com.lvmoney.k8s.base.utils.Ssh2Util; +import com.lvmoney.k8s.base.util.ExecCmdResult; +import com.lvmoney.k8s.base.util.Ssh2Util; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/frame-k8s-support/frame-config-client-support/src/main/java/com/lvmoney/k8s/config/client/controller/ClientController.java b/frame-k8s-support/frame-config-client-support/src/main/java/com/lvmoney/k8s/config/client/controller/ClientController.java index ce52f55..c596b55 100644 --- a/frame-k8s-support/frame-config-client-support/src/main/java/com/lvmoney/k8s/config/client/controller/ClientController.java +++ b/frame-k8s-support/frame-config-client-support/src/main/java/com/lvmoney/k8s/config/client/controller/ClientController.java @@ -7,7 +7,7 @@ package com.lvmoney.k8s.config.client.controller;/** */ -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.k8s.config.client.dao.TestDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/frame-k8s-support/frame-customer-support/src/main/java/com/lvmoney/customer/controller/CustomerController.java b/frame-k8s-support/frame-customer-support/src/main/java/com/lvmoney/customer/controller/CustomerController.java index 6bcd176..d55c678 100644 --- a/frame-k8s-support/frame-customer-support/src/main/java/com/lvmoney/customer/controller/CustomerController.java +++ b/frame-k8s-support/frame-customer-support/src/main/java/com/lvmoney/customer/controller/CustomerController.java @@ -7,8 +7,8 @@ package com.lvmoney.customer.controller;/** */ -import com.lvmoney.common.utils.ResultUtil; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.customer.server.UserServer; import com.lvmoney.customer.vo.req.UserReqVo; import com.lvmoney.customer.vo.resp.UserRespVo; diff --git a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/controller/IndexController.java b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/controller/IndexController.java index 23585fe..fa07120 100644 --- a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/controller/IndexController.java +++ b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/controller/IndexController.java @@ -1,7 +1,7 @@ package com.lvmoney.k8s.gateway.controller; import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.k8s.gateway.ro.WhiteListRo; import com.lvmoney.k8s.gateway.server.AuthenticationServerConfig; import com.lvmoney.k8s.gateway.service.WhiteListService; diff --git a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/exception/GatewayException.java b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/exception/GatewayException.java index e73f286..936c98e 100644 --- a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/exception/GatewayException.java +++ b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/exception/GatewayException.java @@ -7,7 +7,7 @@ package com.lvmoney.k8s.gateway.exception;/** */ -import com.lvmoney.common.exceptions.ExceptionType; +import com.lvmoney.common.exception.ExceptionType; /** * @describe： diff --git a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/filter/AuthenticationFilter.java b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/filter/AuthenticationFilter.java index b0d3b68..c6aa4f4 100644 --- a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/filter/AuthenticationFilter.java +++ b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/filter/AuthenticationFilter.java @@ -9,14 +9,13 @@ package com.lvmoney.k8s.gateway.filter;/** import com.lvmoney.common.constant.CommonConstant; import com.lvmoney.common.enums.InternalService; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.utils.IpUtil; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.util.IpUtil; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.common.vo.ServerInfo; import com.lvmoney.k8s.gateway.constant.GatewayConstant; import com.lvmoney.k8s.gateway.exception.GatewayException; import com.lvmoney.k8s.gateway.properties.GatewayConfigProp; -import com.lvmoney.k8s.gateway.ro.WhiteListRo; import com.lvmoney.k8s.gateway.server.AuthenticationServerConfig; import com.lvmoney.k8s.gateway.service.Gateway2RedisService; import com.lvmoney.k8s.gateway.service.ServerService; @@ -42,7 +41,6 @@ import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import java.net.URI; import java.util.*; import java.util.stream.Collectors; diff --git a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/init/AfterStartupInit.java b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/init/AfterStartupInit.java index 15f6e5d..655156b 100644 --- a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/init/AfterStartupInit.java +++ b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/init/AfterStartupInit.java @@ -7,7 +7,7 @@ package com.lvmoney.k8s.gateway.init;/** */ -import com.lvmoney.common.utils.MapUtil; +import com.lvmoney.common.util.MapUtil; import com.lvmoney.common.vo.ServerInfo; import com.lvmoney.k8s.gateway.ro.RouteDefinitionRo; import com.lvmoney.k8s.gateway.service.Gateway2DbService; @@ -15,7 +15,6 @@ import com.lvmoney.k8s.gateway.service.Gateway2RedisService; import com.lvmoney.k8s.gateway.service.ServerService; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.gateway.config.GatewayProperties; import org.springframework.cloud.gateway.route.RouteDefinition; import org.springframework.stereotype.Service; diff --git a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/server/AuthenticationServer.java b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/server/AuthenticationServer.java index 9ef052c..311a487 100644 --- a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/server/AuthenticationServer.java +++ b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/server/AuthenticationServer.java @@ -7,7 +7,7 @@ package com.lvmoney.k8s.gateway.server;/** */ -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.k8s.gateway.vo.resp.Oauth2TokenCheck; import com.lvmoney.k8s.gateway.vo.resp.ShiroAuthorityCheck; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +23,7 @@ public interface AuthenticationServer { /** * 用户token校验 * - * @return: com.lvmoney.common.utils.vo.ResultData + * @return: com.lvmoney.common.util.vo.ResultData * @author: lvmoney /XXXXXX科技有限公司 * @date: 2019/9/9 19:21 */ @@ -35,7 +35,7 @@ public interface AuthenticationServer { * 用户权限校验 * * @param servletPath:servlet地址 - * @return: com.lvmoney.common.utils.vo.ResultData + * @return: com.lvmoney.common.util.vo.ResultData * @author: lvmoney /XXXXXX科技有限公司 * @date: 2019/9/9 19:22 */ diff --git a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/utils/ExceptionUtil.java b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/utils/ExceptionUtil.java index 961fae5..80d695b 100644 --- a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/utils/ExceptionUtil.java +++ b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/utils/ExceptionUtil.java @@ -1,17 +1,16 @@ package com.lvmoney.k8s.gateway.utils;/** * 描述: - * 包名:com.lvmoney.k8s.gateway.utils + * 包名:com.lvmoney.k8s.gateway.util * 版本信息: 版本1.0 * 日期:2019/8/14 * Copyright XXXXXX科技有限公司 */ -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.utils.JsonUtil; -import com.lvmoney.common.utils.ResultUtil; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.util.JsonUtil; +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.server.reactive.ServerHttpResponse; diff --git a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/utils/FilterMapUtil.java b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/utils/FilterMapUtil.java index 053f9d5..16a3827 100644 --- a/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/utils/FilterMapUtil.java +++ b/frame-k8s-support/frame-gateway-support/src/main/java/com/lvmoney/k8s/gateway/utils/FilterMapUtil.java @@ -1,13 +1,13 @@ package com.lvmoney.k8s.gateway.utils;/** * 描述: - * 包名:com.lvmoney.k8s.gateway.utils + * 包名:com.lvmoney.k8s.gateway.util * 版本信息: 版本1.0 * 日期:2019/8/14 * Copyright XXXXXX科技有限公司 */ -import com.lvmoney.common.utils.WildcardUtil; +import com.lvmoney.common.util.WildcardUtil; import java.util.Map; diff --git a/frame-k8s-support/frame-logback-support/frame-logback-elasticsearch-support/src/main/java/com/lvmoney/k8s/logback/elasticsearch/service/impl/EsLogbackServiceImpl.java b/frame-k8s-support/frame-logback-support/frame-logback-elasticsearch-support/src/main/java/com/lvmoney/k8s/logback/elasticsearch/service/impl/EsLogbackServiceImpl.java index b08ce4a..bbbe75a 100644 --- a/frame-k8s-support/frame-logback-support/frame-logback-elasticsearch-support/src/main/java/com/lvmoney/k8s/logback/elasticsearch/service/impl/EsLogbackServiceImpl.java +++ b/frame-k8s-support/frame-logback-support/frame-logback-elasticsearch-support/src/main/java/com/lvmoney/k8s/logback/elasticsearch/service/impl/EsLogbackServiceImpl.java @@ -9,7 +9,7 @@ package com.lvmoney.k8s.logback.elasticsearch.service.impl;/** import com.github.dozermapper.core.DozerBeanMapperBuilder; import com.github.dozermapper.core.Mapper; -import com.lvmoney.common.utils.SnowflakeIdFactoryUtil; +import com.lvmoney.common.util.SnowflakeIdFactoryUtil; import com.lvmoney.elasticsearch.service.ElasticsearchService; import com.lvmoney.elasticsearch.vo.ElasticsearchSaveVo; import com.lvmoney.k8s.logback.common.service.LogbackService; diff --git a/frame-k8s-support/frame-logback-support/frame-logback-elasticsearch-support/src/main/java/com/lvmoney/k8s/logback/elasticsearch/service/impl/LogbackAppender.java b/frame-k8s-support/frame-logback-support/frame-logback-elasticsearch-support/src/main/java/com/lvmoney/k8s/logback/elasticsearch/service/impl/LogbackAppender.java index f1ea447..c5454db 100644 --- a/frame-k8s-support/frame-logback-support/frame-logback-elasticsearch-support/src/main/java/com/lvmoney/k8s/logback/elasticsearch/service/impl/LogbackAppender.java +++ b/frame-k8s-support/frame-logback-support/frame-logback-elasticsearch-support/src/main/java/com/lvmoney/k8s/logback/elasticsearch/service/impl/LogbackAppender.java @@ -9,7 +9,7 @@ package com.lvmoney.k8s.logback.elasticsearch.service.impl;/** import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.UnsynchronizedAppenderBase; -import com.lvmoney.common.utils.ApplicationBeanUtil; +import com.lvmoney.common.util.ApplicationBeanUtil; import com.lvmoney.k8s.logback.common.vo.LogVo; /** diff --git a/frame-k8s-support/frame-logback-support/frame-logback-mongo-support/src/main/java/com/lvmoney/k8s/logback/mongo/service/impl/LogbackAppender.java b/frame-k8s-support/frame-logback-support/frame-logback-mongo-support/src/main/java/com/lvmoney/k8s/logback/mongo/service/impl/LogbackAppender.java index 9ec186d..a7865d7 100644 --- a/frame-k8s-support/frame-logback-support/frame-logback-mongo-support/src/main/java/com/lvmoney/k8s/logback/mongo/service/impl/LogbackAppender.java +++ b/frame-k8s-support/frame-logback-support/frame-logback-mongo-support/src/main/java/com/lvmoney/k8s/logback/mongo/service/impl/LogbackAppender.java @@ -9,7 +9,7 @@ package com.lvmoney.k8s.logback.mongo.service.impl;/** import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.UnsynchronizedAppenderBase; -import com.lvmoney.common.utils.ApplicationBeanUtil; +import com.lvmoney.common.util.ApplicationBeanUtil; import com.lvmoney.k8s.logback.common.vo.LogVo; /** diff --git a/frame-k8s-support/frame-logback-support/frame-logback-redis-support/src/main/java/com/lvmoney/k8s/logback/redis/service/impl/LogbackAppender.java b/frame-k8s-support/frame-logback-support/frame-logback-redis-support/src/main/java/com/lvmoney/k8s/logback/redis/service/impl/LogbackAppender.java index c0c9fb9..50e6c17 100644 --- a/frame-k8s-support/frame-logback-support/frame-logback-redis-support/src/main/java/com/lvmoney/k8s/logback/redis/service/impl/LogbackAppender.java +++ b/frame-k8s-support/frame-logback-support/frame-logback-redis-support/src/main/java/com/lvmoney/k8s/logback/redis/service/impl/LogbackAppender.java @@ -9,8 +9,7 @@ package com.lvmoney.k8s.logback.redis.service.impl;/** import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.UnsynchronizedAppenderBase; -import com.lvmoney.common.utils.ApplicationBeanUtil; -import com.lvmoney.k8s.logback.common.service.LogbackService; +import com.lvmoney.common.util.ApplicationBeanUtil; import com.lvmoney.k8s.logback.common.vo.LogVo; /** diff --git a/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/controller/IndexController.java b/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/controller/IndexController.java index d3a5686..caecad8 100644 --- a/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/controller/IndexController.java +++ b/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/controller/IndexController.java @@ -7,13 +7,11 @@ package com.lvmoney.provider.controller;/** */ -import com.lvmoney.common.utils.ResultUtil; -import com.lvmoney.common.utils.vo.ResultData; -import com.lvmoney.redis.service.impl.BaseRedisServiceImpl; +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; /** diff --git a/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/controller/ProviderController.java b/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/controller/ProviderController.java index 3a8c0d3..0a0487e 100644 --- a/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/controller/ProviderController.java +++ b/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/controller/ProviderController.java @@ -7,8 +7,8 @@ package com.lvmoney.provider.controller;/** */ -import com.lvmoney.common.utils.ResultUtil; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.k8s.base.annotations.ReleaseServer; import com.lvmoney.provider.service.UserService; import com.lvmoney.provider.vo.req.UserReqVo; diff --git a/frame-k8s-support/frame-resource-support/src/main/java/com/lvmoney/k8s/resource/controller/ResourceController.java b/frame-k8s-support/frame-resource-support/src/main/java/com/lvmoney/k8s/resource/controller/ResourceController.java index a9cea00..79f6cce 100644 --- a/frame-k8s-support/frame-resource-support/src/main/java/com/lvmoney/k8s/resource/controller/ResourceController.java +++ b/frame-k8s-support/frame-resource-support/src/main/java/com/lvmoney/k8s/resource/controller/ResourceController.java @@ -7,8 +7,8 @@ package com.lvmoney.k8s.resource.controller;/** */ -import com.lvmoney.common.utils.ResultUtil; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.k8s.resource.resp.UserInfoVoResp; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/annotations/DynamicService.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/annotation/DynamicService.java similarity index 90% rename from frame-kafka-support/src/main/java/com/lvmoney/kafka/annotations/DynamicService.java rename to frame-kafka-support/src/main/java/com/lvmoney/kafka/annotation/DynamicService.java index 0b33b2f..322eadb 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/annotations/DynamicService.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/annotation/DynamicService.java @@ -1,4 +1,4 @@ -package com.lvmoney.kafka.annotations; +package com.lvmoney.kafka.annotation; import java.lang.annotation.*; diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/constant/KafkaConstant.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/constant/KafkaConstant.java index 294c417..d9a06a3 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/constant/KafkaConstant.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/constant/KafkaConstant.java @@ -1,6 +1,6 @@ package com.lvmoney.kafka.constant;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/customer/SimpleCustomer.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/customer/SimpleCustomer.java index 7ca57d2..9b766f2 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/customer/SimpleCustomer.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/customer/SimpleCustomer.java @@ -1,6 +1,6 @@ package com.lvmoney.kafka.customer;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 @@ -8,8 +8,8 @@ package com.lvmoney.kafka.customer;/** import com.alibaba.fastjson.JSONObject; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.kafka.constant.KafkaConstant; import com.lvmoney.kafka.factory.HandMqServiceContext; import com.lvmoney.kafka.utils.ContextBeanUtil; diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/customer/SynchronousCustomer.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/customer/SynchronousCustomer.java index 57c62de..64b6e2e 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/customer/SynchronousCustomer.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/customer/SynchronousCustomer.java @@ -1,6 +1,6 @@ package com.lvmoney.kafka.customer;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 @@ -8,8 +8,8 @@ package com.lvmoney.kafka.customer;/** import com.alibaba.fastjson.JSONObject; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.kafka.constant.KafkaConstant; import com.lvmoney.kafka.factory.HandMqServiceContext; import com.lvmoney.kafka.utils.ContextBeanUtil; diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/listener/ProviderListener.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/listener/ProviderListener.java index 8c3bc51..8a39ffc 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/listener/ProviderListener.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/listener/ProviderListener.java @@ -1,16 +1,15 @@ package com.lvmoney.kafka.listener;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 */ -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.kafka.ro.ErrorRecordRo; import com.lvmoney.kafka.service.KafkaRedisService; -import org.apache.commons.lang3.StringUtils; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.RecordMetadata; import org.slf4j.Logger; diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/provider/SimpleSender.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/provider/SimpleSender.java index 6e903fc..5d93ea8 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/provider/SimpleSender.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/provider/SimpleSender.java @@ -1,14 +1,14 @@ package com.lvmoney.kafka.provider;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 */ -import com.lvmoney.common.utils.JsonUtil; -import com.lvmoney.common.utils.ReflectUtil; +import com.lvmoney.common.util.JsonUtil; +import com.lvmoney.common.util.ReflectUtil; import com.lvmoney.kafka.constant.KafkaConstant; import com.lvmoney.kafka.listener.ProviderListener; import com.lvmoney.kafka.vo.MessageVo; diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/provider/SynchronousSender.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/provider/SynchronousSender.java index ed26e2b..81ff940 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/provider/SynchronousSender.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/provider/SynchronousSender.java @@ -1,6 +1,6 @@ package com.lvmoney.kafka.provider;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 @@ -24,9 +24,9 @@ package com.lvmoney.kafka.provider;/** * 2018年10月30日 下午3:29:38 */ -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.kafka.constant.KafkaConstant; import com.lvmoney.kafka.listener.ProviderListener; import com.lvmoney.kafka.vo.MessageVo; diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/ro/ErrorRecordRo.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/ro/ErrorRecordRo.java index f0a0c4c..6de76ce 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/ro/ErrorRecordRo.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/ro/ErrorRecordRo.java @@ -1,6 +1,6 @@ package com.lvmoney.kafka.ro;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/KafkaRedisService.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/KafkaRedisService.java index 91ee9c1..26969c1 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/KafkaRedisService.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/KafkaRedisService.java @@ -1,6 +1,6 @@ package com.lvmoney.kafka.service;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/impl/HandTestDataServiceImpl.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/impl/HandTestDataServiceImpl.java index 93993f5..74cf96f 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/impl/HandTestDataServiceImpl.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/impl/HandTestDataServiceImpl.java @@ -8,7 +8,7 @@ package com.lvmoney.kafka.service.impl; -import com.lvmoney.kafka.annotations.DynamicService; +import com.lvmoney.kafka.annotation.DynamicService; import com.lvmoney.kafka.service.HandMqDataService; import com.lvmoney.kafka.vo.MessageVo; import org.springframework.stereotype.Service; diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/impl/KafkaRedisServiceImpl.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/impl/KafkaRedisServiceImpl.java index 0215ce8..5e579ce 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/impl/KafkaRedisServiceImpl.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/service/impl/KafkaRedisServiceImpl.java @@ -1,6 +1,6 @@ package com.lvmoney.kafka.service.impl;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/utils/ContextBeanUtil.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/utils/ContextBeanUtil.java index 8aa8a8b..143b708 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/utils/ContextBeanUtil.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/utils/ContextBeanUtil.java @@ -1,13 +1,13 @@ package com.lvmoney.kafka.utils;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 */ -import com.lvmoney.kafka.annotations.DynamicService; +import com.lvmoney.kafka.annotation.DynamicService; import com.lvmoney.kafka.factory.HandMqServiceContext; import com.lvmoney.kafka.service.HandMqDataService; diff --git a/frame-kafka-support/src/main/java/com/lvmoney/kafka/vo/MessageVo.java b/frame-kafka-support/src/main/java/com/lvmoney/kafka/vo/MessageVo.java index 36f9e56..7a4e987 100644 --- a/frame-kafka-support/src/main/java/com/lvmoney/kafka/vo/MessageVo.java +++ b/frame-kafka-support/src/main/java/com/lvmoney/kafka/vo/MessageVo.java @@ -1,6 +1,6 @@ package com.lvmoney.kafka.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 diff --git a/frame-lock-support/src/main/java/com/lvmoney/lock/service/impl/ProdLockServiceImpl.java b/frame-lock-support/src/main/java/com/lvmoney/lock/service/impl/ProdLockServiceImpl.java index 6393eb2..9c2ae71 100644 --- a/frame-lock-support/src/main/java/com/lvmoney/lock/service/impl/ProdLockServiceImpl.java +++ b/frame-lock-support/src/main/java/com/lvmoney/lock/service/impl/ProdLockServiceImpl.java @@ -8,8 +8,8 @@ package com.lvmoney.lock.service.impl;/** import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.lock.constant.LockConstant; import com.lvmoney.lock.service.DistributedLockerService; import com.lvmoney.lock.service.ProdLockService; diff --git a/frame-lock-support/src/main/java/com/lvmoney/lock/service/impl/SequenceServiceImpl.java b/frame-lock-support/src/main/java/com/lvmoney/lock/service/impl/SequenceServiceImpl.java index cc07d57..930df88 100644 --- a/frame-lock-support/src/main/java/com/lvmoney/lock/service/impl/SequenceServiceImpl.java +++ b/frame-lock-support/src/main/java/com/lvmoney/lock/service/impl/SequenceServiceImpl.java @@ -7,7 +7,7 @@ package com.lvmoney.lock.service.impl;/** */ -import com.lvmoney.common.utils.StringUtil; +import com.lvmoney.common.util.StringUtil; import com.lvmoney.lock.constant.LockConstant; import com.lvmoney.lock.service.DistributedLockerService; import com.lvmoney.lock.service.SequenceService; diff --git a/frame-log-support/src/main/java/com/lvmoney/log/annotations/ControllerLog.java b/frame-log-support/src/main/java/com/lvmoney/log/annotation/ControllerLog.java similarity index 96% rename from frame-log-support/src/main/java/com/lvmoney/log/annotations/ControllerLog.java rename to frame-log-support/src/main/java/com/lvmoney/log/annotation/ControllerLog.java index b51430c..2095881 100644 --- a/frame-log-support/src/main/java/com/lvmoney/log/annotations/ControllerLog.java +++ b/frame-log-support/src/main/java/com/lvmoney/log/annotation/ControllerLog.java @@ -1,4 +1,4 @@ -package com.lvmoney.log.annotations;/** +package com.lvmoney.log.annotation;/** * 描述: * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 diff --git a/frame-log-support/src/main/java/com/lvmoney/log/annotations/NotLog.java b/frame-log-support/src/main/java/com/lvmoney/log/annotation/NotLog.java similarity index 85% rename from frame-log-support/src/main/java/com/lvmoney/log/annotations/NotLog.java rename to frame-log-support/src/main/java/com/lvmoney/log/annotation/NotLog.java index 9f7b48d..857a3dd 100644 --- a/frame-log-support/src/main/java/com/lvmoney/log/annotations/NotLog.java +++ b/frame-log-support/src/main/java/com/lvmoney/log/annotation/NotLog.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019年1月4日 下午2:26:15 * Copyright xxxx科技有限公司 */ -package com.lvmoney.log.annotations; +package com.lvmoney.log.annotation; import java.lang.annotation.*; diff --git a/frame-log-support/src/main/java/com/lvmoney/log/annotations/ServiceLog.java b/frame-log-support/src/main/java/com/lvmoney/log/annotation/ServiceLog.java similarity index 92% rename from frame-log-support/src/main/java/com/lvmoney/log/annotations/ServiceLog.java rename to frame-log-support/src/main/java/com/lvmoney/log/annotation/ServiceLog.java index f2aa290..496d2fe 100644 --- a/frame-log-support/src/main/java/com/lvmoney/log/annotations/ServiceLog.java +++ b/frame-log-support/src/main/java/com/lvmoney/log/annotation/ServiceLog.java @@ -1,4 +1,4 @@ -package com.lvmoney.log.annotations;/** +package com.lvmoney.log.annotation;/** * 描述: * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 diff --git a/frame-log-support/src/main/java/com/lvmoney/log/aspect/LogAspect.java b/frame-log-support/src/main/java/com/lvmoney/log/aspect/LogAspect.java index 88ccb70..d074809 100644 --- a/frame-log-support/src/main/java/com/lvmoney/log/aspect/LogAspect.java +++ b/frame-log-support/src/main/java/com/lvmoney/log/aspect/LogAspect.java @@ -8,12 +8,12 @@ package com.lvmoney.log.aspect;/** import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SimplePropertyPreFilter; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.utils.vo.ResultData; -import com.lvmoney.log.annotations.ControllerLog; -import com.lvmoney.log.annotations.NotLog; -import com.lvmoney.log.annotations.ServiceLog; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.common.util.vo.ResultData; +import com.lvmoney.log.annotation.ControllerLog; +import com.lvmoney.log.annotation.NotLog; +import com.lvmoney.log.annotation.ServiceLog; import com.lvmoney.log.constant.LogConstant; import com.lvmoney.log.service.LogService; import com.lvmoney.log.vo.ControllerVo; @@ -68,14 +68,14 @@ public class LogAspect { /*** * 定义service切入点拦截规则，拦截SystemServiceLog注解的方法 */ - @Pointcut("@annotation(com.lvmoney.log.annotations.ServiceLog)") + @Pointcut("@annotation(com.lvmoney.log.annotation.ServiceLog)") public void serviceAspect() { } /*** * 定义controller切入点拦截规则，拦截SystemControllerLog注解的方法 */ - @Pointcut("@annotation(com.lvmoney.log.annotations.ControllerLog)") + @Pointcut("@annotation(com.lvmoney.log.annotation.ControllerLog)") public void controllerAspect() { } diff --git a/frame-log-support/src/main/java/com/lvmoney/log/controller/UserController.java b/frame-log-support/src/main/java/com/lvmoney/log/controller/UserController.java index ce2e883..ece834e 100644 --- a/frame-log-support/src/main/java/com/lvmoney/log/controller/UserController.java +++ b/frame-log-support/src/main/java/com/lvmoney/log/controller/UserController.java @@ -11,7 +11,7 @@ package com.lvmoney.log.controller;/** */ -import com.lvmoney.log.annotations.ControllerLog; +import com.lvmoney.log.annotation.ControllerLog; import com.lvmoney.log.constant.LogType; import com.lvmoney.log.vo.ThrowableVo; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/frame-modules-test/src/main/java/com/lvmoney/log/controller/LogController.java b/frame-modules-test/src/main/java/com/lvmoney/log/controller/LogController.java index af91c9e..977efc9 100644 --- a/frame-modules-test/src/main/java/com/lvmoney/log/controller/LogController.java +++ b/frame-modules-test/src/main/java/com/lvmoney/log/controller/LogController.java @@ -1,7 +1,7 @@ package com.lvmoney.log.controller; -import com.lvmoney.log.annotations.ControllerLog; -import com.lvmoney.log.annotations.NotLog; +import com.lvmoney.log.annotation.ControllerLog; +import com.lvmoney.log.annotation.NotLog; import com.lvmoney.log.constant.LogType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/frame-mongo-support/src/main/java/com/lvmoney/mongo/service/impl/BaseGridFsServiceImpl.java b/frame-mongo-support/src/main/java/com/lvmoney/mongo/service/impl/BaseGridFsServiceImpl.java index 7969240..d380070 100644 --- a/frame-mongo-support/src/main/java/com/lvmoney/mongo/service/impl/BaseGridFsServiceImpl.java +++ b/frame-mongo-support/src/main/java/com/lvmoney/mongo/service/impl/BaseGridFsServiceImpl.java @@ -14,8 +14,8 @@ import com.mongodb.client.gridfs.GridFSBucket; import com.mongodb.client.gridfs.GridFSDownloadStream; import com.mongodb.client.gridfs.GridFSFindIterable; import com.mongodb.client.gridfs.model.GridFSFile; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.mongo.service.BaseGridFsService; import com.lvmoney.mongo.vo.BaseGridFsByteOutVo; import com.lvmoney.mongo.vo.BaseGridFsOutVo; diff --git a/frame-mongo-support/src/main/java/com/lvmoney/mongo/service/impl/BaseMongoServiceImpl.java b/frame-mongo-support/src/main/java/com/lvmoney/mongo/service/impl/BaseMongoServiceImpl.java index a8b187f..147dcae 100644 --- a/frame-mongo-support/src/main/java/com/lvmoney/mongo/service/impl/BaseMongoServiceImpl.java +++ b/frame-mongo-support/src/main/java/com/lvmoney/mongo/service/impl/BaseMongoServiceImpl.java @@ -8,8 +8,8 @@ package com.lvmoney.mongo.service.impl; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.mongo.service.BaseMongoService; import com.lvmoney.mongo.vo.BaseMongoCollective; import com.lvmoney.mongo.vo.BaseMongoVo; diff --git a/frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/utils/EncryptPwdUtil.java b/frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/util/EncryptPwdUtil.java similarity index 97% rename from frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/utils/EncryptPwdUtil.java rename to frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/util/EncryptPwdUtil.java index 8b1b97d..b7ee14f 100644 --- a/frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/utils/EncryptPwdUtil.java +++ b/frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/util/EncryptPwdUtil.java @@ -1,6 +1,6 @@ -package com.lvmoney.mysql.base.utils;/** +package com.lvmoney.mysql.base.util;/** * 描述: - * 包名:com.lvmoney.mysql.utils + * 包名:com.lvmoney.mysql.util * 版本信息: 版本1.0 * 日期:2019/9/5 * Copyright XXXXXX科技有限公司 diff --git a/frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/utils/MapperGenerator.java b/frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/util/MapperGenerator.java similarity index 98% rename from frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/utils/MapperGenerator.java rename to frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/util/MapperGenerator.java index 2ca1afb..9229049 100644 --- a/frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/utils/MapperGenerator.java +++ b/frame-mysql-support/frame-mysql-base/src/main/java/com/lvmoney/mysql/base/util/MapperGenerator.java @@ -1,4 +1,4 @@ -package com.lvmoney.mysql.base.utils; +package com.lvmoney.mysql.base.util; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.generator.AutoGenerator; diff --git a/frame-mysql-support/frame-mysql-rwseparate-support/src/test/java/com/lvmoney/test/DemoServiceTest.java b/frame-mysql-support/frame-mysql-rwseparate-support/src/test/java/com/lvmoney/test/DemoServiceTest.java index 5537529..a45df90 100644 --- a/frame-mysql-support/frame-mysql-rwseparate-support/src/test/java/com/lvmoney/test/DemoServiceTest.java +++ b/frame-mysql-support/frame-mysql-rwseparate-support/src/test/java/com/lvmoney/test/DemoServiceTest.java @@ -7,7 +7,7 @@ package com.lvmoney.test;/** */ -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.mysql.rwseparate.application.Application; import com.lvmoney.mysql.rwseparate.po.TestPo; import com.lvmoney.mysql.rwseparate.service.TestService; diff --git a/frame-mysql-support/frame-mysql-separate-support/src/test/java/com/lvmoney/test/DemoServiceTest.java b/frame-mysql-support/frame-mysql-separate-support/src/test/java/com/lvmoney/test/DemoServiceTest.java index 0a40ac1..4819b27 100644 --- a/frame-mysql-support/frame-mysql-separate-support/src/test/java/com/lvmoney/test/DemoServiceTest.java +++ b/frame-mysql-support/frame-mysql-separate-support/src/test/java/com/lvmoney/test/DemoServiceTest.java @@ -7,7 +7,7 @@ package com.lvmoney.test;/** */ -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.mysql.separate.application.Application; import com.lvmoney.mysql.separate.po.TestPo; import com.lvmoney.mysql.separate.service.TestService; diff --git a/frame-mysql-support/frame-mysql-separate2-support/src/test/java/com/lvmoney/test/DemoServiceTest.java b/frame-mysql-support/frame-mysql-separate2-support/src/test/java/com/lvmoney/test/DemoServiceTest.java index d3a230f..2d32db8 100644 --- a/frame-mysql-support/frame-mysql-separate2-support/src/test/java/com/lvmoney/test/DemoServiceTest.java +++ b/frame-mysql-support/frame-mysql-separate2-support/src/test/java/com/lvmoney/test/DemoServiceTest.java @@ -7,7 +7,7 @@ package com.lvmoney.test;/** */ -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.mysql.separate.application.Application; import com.lvmoney.mysql.separate.po.TestPo; import com.lvmoney.mysql.separate.service.TestService; diff --git a/frame-netty-support/frame-netty-client/src/main/java/com/lvmoney/netty/client/client/NettyClientListener.java b/frame-netty-support/frame-netty-client/src/main/java/com/lvmoney/netty/client/client/NettyClientListener.java index e18abb7..acef610 100644 --- a/frame-netty-support/frame-netty-client/src/main/java/com/lvmoney/netty/client/client/NettyClientListener.java +++ b/frame-netty-support/frame-netty-client/src/main/java/com/lvmoney/netty/client/client/NettyClientListener.java @@ -1,7 +1,7 @@ package com.lvmoney.netty.client.client; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.netty.client.action.MainAction; import com.lvmoney.netty.client.config.NettyConfig; import org.slf4j.Logger; diff --git a/frame-netty-support/frame-netty-common/src/main/java/com/lvmoney/netty/util/ObjectCodec.java b/frame-netty-support/frame-netty-common/src/main/java/com/lvmoney/netty/util/ObjectCodec.java index e49ccf0..1316d5b 100644 --- a/frame-netty-support/frame-netty-common/src/main/java/com/lvmoney/netty/util/ObjectCodec.java +++ b/frame-netty-support/frame-netty-common/src/main/java/com/lvmoney/netty/util/ObjectCodec.java @@ -1,6 +1,6 @@ package com.lvmoney.netty.util; -import com.lvmoney.common.utils.ObjectSerializerUtil; +import com.lvmoney.common.util.ObjectSerializerUtil; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/aspect/WebRequestLogAspect.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/aspect/WebRequestLogAspect.java index 064a201..fc4ca80 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/aspect/WebRequestLogAspect.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/aspect/WebRequestLogAspect.java @@ -6,7 +6,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import com.lvmoney.common.utils.JacksonUtil; +import com.lvmoney.common.util.JacksonUtil; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAccessDeniedHandler.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAccessDeniedHandler.java index b6037a9..466dc42 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAccessDeniedHandler.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAccessDeniedHandler.java @@ -1,7 +1,7 @@ package com.lvmoney.oauth2.center.server.config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAuthenticationFailureHandler.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAuthenticationFailureHandler.java index 755bc92..e1b5dfc 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAuthenticationFailureHandler.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAuthenticationFailureHandler.java @@ -3,7 +3,7 @@ package com.lvmoney.oauth2.center.server.config; import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.oauth2.center.server.exception.CustomOauthException; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import com.lvmoney.oauth2.center.server.service.LoginHistoryService; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAuthenticationSuccessHandler.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAuthenticationSuccessHandler.java index a75f1b2..32da6f3 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAuthenticationSuccessHandler.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/ClientAuthenticationSuccessHandler.java @@ -3,8 +3,8 @@ package com.lvmoney.oauth2.center.server.config; import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.oauth2.center.server.exception.CustomOauthException; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import com.lvmoney.oauth2.center.server.service.UserAccountService; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/WeChatMiniProgramTokenGranter.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/WeChatMiniProgramTokenGranter.java index d793d6f..902ea7c 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/WeChatMiniProgramTokenGranter.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/config/WeChatMiniProgramTokenGranter.java @@ -5,7 +5,7 @@ //import com.lvmoney.oauth2.center.server.vo.RoleEnum; //import com.lvmoney.oauth2.center.server.vo.UserInfo; //import com.lvmoney.oauth2.center.server.db.entity.ThirdPartyAccount; -//import com.lvmoney.common.utils.JacksonUtil; +//import com.lvmoney.common.util.JacksonUtil; //import org.apache.commons.lang3.StringUtils; //import org.springframework.security.authentication.AbstractAuthenticationToken; //import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/AccessConfirmationController.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/AccessConfirmationController.java index 20db3b5..fd8b68e 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/AccessConfirmationController.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/AccessConfirmationController.java @@ -1,6 +1,6 @@ package com.lvmoney.oauth2.center.server.controller; -import com.lvmoney.common.exceptions.BusinessException; +import com.lvmoney.common.exception.BusinessException; import com.lvmoney.oauth2.center.server.db.dao.OauthClientDao; import com.lvmoney.oauth2.center.server.db.entity.OauthClient; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/CaptchaController.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/CaptchaController.java index 078cd84..6d8ecd1 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/CaptchaController.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/CaptchaController.java @@ -2,7 +2,7 @@ package com.lvmoney.oauth2.center.server.controller; import com.lvmoney.captcha.service.CaptchaService; import com.lvmoney.captcha.vo.ValidateResultVo; -import com.lvmoney.common.exceptions.BusinessException; +import com.lvmoney.common.exception.BusinessException; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import com.lvmoney.oauth2.center.server.vo.resp.CaptchaGraphBase64RespVo; import com.lvmoney.oauth2.center.server.vo.resp.CaptchaGraphRespVo; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/ManageUserController.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/ManageUserController.java index 8c96207..7e9d19d 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/ManageUserController.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/ManageUserController.java @@ -1,6 +1,6 @@ package com.lvmoney.oauth2.center.server.controller; -import com.lvmoney.common.exceptions.BusinessException; +import com.lvmoney.common.exception.BusinessException; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import com.lvmoney.oauth2.center.server.service.UserAccountService; import com.lvmoney.oauth2.center.server.vo.*; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/ProfileController.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/ProfileController.java index ff6ca46..cf55d75 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/ProfileController.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/controller/ProfileController.java @@ -1,27 +1,19 @@ package com.lvmoney.oauth2.center.server.controller; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.lvmoney.common.exceptions.BusinessException; +import com.lvmoney.common.exception.BusinessException; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import com.lvmoney.oauth2.center.server.service.Oauth2RedisService; -import com.lvmoney.oauth2.center.server.service.UserAccountService; -import com.lvmoney.oauth2.center.server.vo.UserAccountVo; import com.lvmoney.oauth2.center.server.vo.UserInfo; import com.lvmoney.oauth2.center.server.vo.resp.UserMeRespVo; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.text.StringEscapeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.provider.token.TokenStore; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import java.security.Principal; -import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/exception/Oauth2Exception.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/exception/Oauth2Exception.java index cbe8e26..a86b65d 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/exception/Oauth2Exception.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/exception/Oauth2Exception.java @@ -7,8 +7,7 @@ package com.lvmoney.oauth2.center.server.exception;/** */ -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.exceptions.ExceptionType; +import com.lvmoney.common.exception.ExceptionType; /** * @describe： diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/ro/Oauth2ClientDetailRo.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/ro/Oauth2ClientDetailRo.java index 8581dd3..3ab350e 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/ro/Oauth2ClientDetailRo.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/ro/Oauth2ClientDetailRo.java @@ -1,6 +1,6 @@ package com.lvmoney.oauth2.center.server.ro;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2018年10月30日 * Copyright xxxx科技有限公司 diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/Db2RedisServiceImpl.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/Db2RedisServiceImpl.java index 6e8a7c4..2b2ebbe 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/Db2RedisServiceImpl.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/Db2RedisServiceImpl.java @@ -10,7 +10,7 @@ package com.lvmoney.oauth2.center.server.service.impl;/** import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.utils.StringUtil; +import com.lvmoney.common.util.StringUtil; import com.lvmoney.oauth2.center.server.constant.Oauth2ServerConstant; import com.lvmoney.oauth2.center.server.db.dao.OauthClientDao; import com.lvmoney.oauth2.center.server.db.dao.UserAccountDao; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/FrameRedisTokenStoreImpl.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/FrameRedisTokenStoreImpl.java index 8222562..b676b10 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/FrameRedisTokenStoreImpl.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/FrameRedisTokenStoreImpl.java @@ -7,7 +7,7 @@ package com.lvmoney.oauth2.center.server.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.oauth2.center.server.exception.CustomOauthException; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import com.lvmoney.oauth2.center.server.vo.FrameOauth2AccessToken; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/Oauth2RedisServiceImpl.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/Oauth2RedisServiceImpl.java index cde1241..adf13cd 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/Oauth2RedisServiceImpl.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/Oauth2RedisServiceImpl.java @@ -2,7 +2,6 @@ package com.lvmoney.oauth2.center.server.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; -import com.lvmoney.common.exceptions.CommonException; import com.lvmoney.oauth2.center.server.exception.CustomOauthException; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import com.lvmoney.oauth2.center.server.ro.AuthorizationCodeRo; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/RedisClientDetailsServiceImpl.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/RedisClientDetailsServiceImpl.java index a09b426..50a61e8 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/RedisClientDetailsServiceImpl.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/RedisClientDetailsServiceImpl.java @@ -1,26 +1,19 @@ package com.lvmoney.oauth2.center.server.service.impl; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; import com.lvmoney.oauth2.center.server.exception.CustomOauthException; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import com.lvmoney.oauth2.center.server.service.Db2RedisService; import com.lvmoney.oauth2.center.server.service.Oauth2RedisService; -import com.lvmoney.oauth2.center.server.ro.Oauth2ClientDetailRo; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.oauth2.provider.ClientDetails; import org.springframework.security.oauth2.provider.ClientDetailsService; import org.springframework.security.oauth2.provider.ClientRegistrationException; import org.springframework.security.oauth2.provider.client.BaseClientDetails; import org.springframework.stereotype.Service; -import java.util.*; - /** * @describe： diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/RedisUserDetailsServiceImpl.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/RedisUserDetailsServiceImpl.java index 070c2db..8809b63 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/RedisUserDetailsServiceImpl.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/RedisUserDetailsServiceImpl.java @@ -1,28 +1,18 @@ package com.lvmoney.oauth2.center.server.service.impl; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; import com.lvmoney.oauth2.center.server.exception.CustomOauthException; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import com.lvmoney.oauth2.center.server.service.Db2RedisService; import com.lvmoney.oauth2.center.server.vo.UserInfo; -import com.lvmoney.oauth2.center.server.ro.Oauth2UserRo; import com.lvmoney.oauth2.center.server.service.Oauth2RedisService; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @describe： * @author: lvmoney /xxxx科技有限公司 diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/ScopeDefinitionServiceImpl.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/ScopeDefinitionServiceImpl.java index 3440db9..ac2364f 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/ScopeDefinitionServiceImpl.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/ScopeDefinitionServiceImpl.java @@ -1,7 +1,7 @@ package com.lvmoney.oauth2.center.server.service.impl; import com.github.dozermapper.core.Mapper; -import com.lvmoney.common.exceptions.BusinessException; +import com.lvmoney.common.exception.BusinessException; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; import com.lvmoney.oauth2.center.server.db.dao.ScopeDefinitionDao; import com.lvmoney.oauth2.center.server.db.entity.ScopeDefinition; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/UserAccountServiceImpl.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/UserAccountServiceImpl.java index 9eacb3b..f4c7d3d 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/UserAccountServiceImpl.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/service/impl/UserAccountServiceImpl.java @@ -1,8 +1,8 @@ package com.lvmoney.oauth2.center.server.service.impl; import com.github.dozermapper.core.Mapper; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.utils.DateUtil; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.util.DateUtil; import com.lvmoney.oauth2.center.server.db.dao.UserAccountDao; import com.lvmoney.oauth2.center.server.db.entity.UserAccount; import com.lvmoney.oauth2.center.server.exception.Oauth2Exception; diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/utils/PasswordUtil.java b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/utils/PasswordUtil.java index cfd36a8..fe5a70a 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/utils/PasswordUtil.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/java/com/lvmoney/oauth2/center/server/utils/PasswordUtil.java @@ -258,7 +258,7 @@ public class PasswordUtil { /** *@describe: Get password strength level, includes easy, midium, strong, very strong, extremely strong *@param: [passwd] - *@return: com.lvmoney.oauth2.center.server.utils.PasswordUtil.LEVEL + *@return: com.lvmoney.oauth2.center.server.util.PasswordUtil.LEVEL *@author: lvmoney /XXXXXX科技有限公司 *2019/9/9 18:18 */ diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/main/resources/static/assets/bootstrap/js/bootstrap.bundle.js b/frame-oauth2-support/frame-oauth2-center-support/src/main/resources/static/assets/bootstrap/js/bootstrap.bundle.js index 20b0bed..60aa45e 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/main/resources/static/assets/bootstrap/js/bootstrap.bundle.js +++ b/frame-oauth2-support/frame-oauth2-center-support/src/main/resources/static/assets/bootstrap/js/bootstrap.bundle.js @@ -4039,7 +4039,7 @@ /** * Collection of utilities useful when writing custom modifiers. * Starting from version 1.7, this method is available only if you - * include `popper-utils.js` before `popper.js`. + * include `popper-util.js` before `popper.js`. * * **DEPRECATION**: This way to access PopperUtils is deprecated * and will be removed in v2! Use the PopperUtils module directly instead. diff --git a/frame-oauth2-support/frame-oauth2-center-support/src/test/java/com/lvmoney/oauth2/center/server/OAuth2Test.java b/frame-oauth2-support/frame-oauth2-center-support/src/test/java/com/lvmoney/oauth2/center/server/OAuth2Test.java index 09d0507..38c3083 100644 --- a/frame-oauth2-support/frame-oauth2-center-support/src/test/java/com/lvmoney/oauth2/center/server/OAuth2Test.java +++ b/frame-oauth2-support/frame-oauth2-center-support/src/test/java/com/lvmoney/oauth2/center/server/OAuth2Test.java @@ -1,7 +1,7 @@ package com.lvmoney.oauth2.center.server; import com.fasterxml.jackson.core.type.TypeReference; -import com.lvmoney.common.utils.JacksonUtil; +import com.lvmoney.common.util.JacksonUtil; import org.junit.Ignore; import org.junit.Test; import org.springframework.http.*; diff --git a/frame-office-support/src/main/java/com/lvmoney/office/controller/ExcelController.java b/frame-office-support/src/main/java/com/lvmoney/office/controller/ExcelController.java index f388c0a..8102f5b 100644 --- a/frame-office-support/src/main/java/com/lvmoney/office/controller/ExcelController.java +++ b/frame-office-support/src/main/java/com/lvmoney/office/controller/ExcelController.java @@ -7,7 +7,7 @@ // */ // // -//import com.lvmoney.office.utils.ExcelUtil; +//import com.lvmoney.office.util.ExcelUtil; //import com.lvmoney.office.vo.PersonExportVo; //import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMethod; diff --git a/frame-office-support/src/main/java/com/lvmoney/office/controller/PoiController.java b/frame-office-support/src/main/java/com/lvmoney/office/controller/PoiController.java index 06d852e..7bb1c12 100644 --- a/frame-office-support/src/main/java/com/lvmoney/office/controller/PoiController.java +++ b/frame-office-support/src/main/java/com/lvmoney/office/controller/PoiController.java @@ -11,8 +11,8 @@ import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.data.*; import com.deepoove.poi.util.BytePictureUtils; import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.utils.ResultUtil; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.office.service.WordService; import com.lvmoney.office.vo.*; import org.springframework.beans.factory.annotation.Autowired; diff --git a/frame-office-support/src/main/java/com/lvmoney/office/controller/TestController.java b/frame-office-support/src/main/java/com/lvmoney/office/controller/TestController.java index 4b5269d..6eb7d97 100644 --- a/frame-office-support/src/main/java/com/lvmoney/office/controller/TestController.java +++ b/frame-office-support/src/main/java/com/lvmoney/office/controller/TestController.java @@ -7,8 +7,8 @@ package com.lvmoney.office.controller;/** */ -import com.lvmoney.common.utils.ResultUtil; -import com.lvmoney.common.utils.vo.ResultData; +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; import com.lvmoney.office.vo.AVo; import com.lvmoney.office.vo.TestVo; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/frame-office-support/src/main/java/com/lvmoney/office/service/impl/WordServiceImpl.java b/frame-office-support/src/main/java/com/lvmoney/office/service/impl/WordServiceImpl.java index 6cda8bc..ffccd6e 100644 --- a/frame-office-support/src/main/java/com/lvmoney/office/service/impl/WordServiceImpl.java +++ b/frame-office-support/src/main/java/com/lvmoney/office/service/impl/WordServiceImpl.java @@ -12,11 +12,11 @@ import com.deepoove.poi.data.MiniTableRenderData; import com.deepoove.poi.data.NumbericRenderData; import com.deepoove.poi.template.ElementTemplate; import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.utils.FileUtil; -import com.lvmoney.common.utils.MapUtil; -import com.lvmoney.common.utils.SnowflakeIdFactoryUtil; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.common.util.FileUtil; +import com.lvmoney.common.util.MapUtil; +import com.lvmoney.common.util.SnowflakeIdFactoryUtil; import com.lvmoney.office.constant.OfficeConstant; import com.lvmoney.office.enums.WTemplateEnum; import com.lvmoney.office.service.WordService; diff --git a/frame-office-support/src/main/java/com/lvmoney/office/utils/DocxUtil.java b/frame-office-support/src/main/java/com/lvmoney/office/util/DocxUtil.java similarity index 99% rename from frame-office-support/src/main/java/com/lvmoney/office/utils/DocxUtil.java rename to frame-office-support/src/main/java/com/lvmoney/office/util/DocxUtil.java index b38fd99..97a5505 100644 --- a/frame-office-support/src/main/java/com/lvmoney/office/utils/DocxUtil.java +++ b/frame-office-support/src/main/java/com/lvmoney/office/util/DocxUtil.java @@ -1,4 +1,4 @@ -package com.lvmoney.office.utils; +package com.lvmoney.office.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/frame-office-support/src/main/java/com/lvmoney/office/utils/ExcelUtil.java b/frame-office-support/src/main/java/com/lvmoney/office/util/ExcelUtil.java similarity index 97% rename from frame-office-support/src/main/java/com/lvmoney/office/utils/ExcelUtil.java rename to frame-office-support/src/main/java/com/lvmoney/office/util/ExcelUtil.java index 5f3e78e..a3a168d 100644 --- a/frame-office-support/src/main/java/com/lvmoney/office/utils/ExcelUtil.java +++ b/frame-office-support/src/main/java/com/lvmoney/office/util/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.lvmoney.office.utils;/** +package com.lvmoney.office.util;/** * 描述: * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 @@ -12,8 +12,8 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.slf4j.Logger; diff --git a/frame-office-support/src/main/java/com/lvmoney/office/vo/WordTemplateVo.java b/frame-office-support/src/main/java/com/lvmoney/office/vo/WordTemplateVo.java index 881ab0f..6539712 100644 --- a/frame-office-support/src/main/java/com/lvmoney/office/vo/WordTemplateVo.java +++ b/frame-office-support/src/main/java/com/lvmoney/office/vo/WordTemplateVo.java @@ -7,15 +7,9 @@ package com.lvmoney.office.vo;/** */ -import com.deepoove.poi.data.PictureRenderData; -import com.deepoove.poi.data.RenderData; -import com.deepoove.poi.data.TextRenderData; -import com.deepoove.poi.util.BytePictureUtils; -import com.lvmoney.common.utils.JsonUtil; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; /** diff --git a/frame-quartz-support/src/main/java/com/lvmoney/quartz/config/QuartzManager.java b/frame-quartz-support/src/main/java/com/lvmoney/quartz/config/QuartzManager.java index 16df3b0..171fe32 100644 --- a/frame-quartz-support/src/main/java/com/lvmoney/quartz/config/QuartzManager.java +++ b/frame-quartz-support/src/main/java/com/lvmoney/quartz/config/QuartzManager.java @@ -8,9 +8,9 @@ package com.lvmoney.quartz.config; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.utils.ApplicationBeanUtil; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.common.util.ApplicationBeanUtil; import com.lvmoney.quartz.constant.QuartzConstant; import com.lvmoney.quartz.job.AbstractJob; import com.lvmoney.quartz.vo.JobParameter; @@ -18,12 +18,8 @@ import org.quartz.*; import org.quartz.impl.StdSchedulerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.beans.factory.config.AutowireCapableBeanFactory; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/frame-quartz-support/src/main/java/com/lvmoney/quartz/job/AbstractJob.java b/frame-quartz-support/src/main/java/com/lvmoney/quartz/job/AbstractJob.java index df42549..e536e6c 100644 --- a/frame-quartz-support/src/main/java/com/lvmoney/quartz/job/AbstractJob.java +++ b/frame-quartz-support/src/main/java/com/lvmoney/quartz/job/AbstractJob.java @@ -8,9 +8,6 @@ package com.lvmoney.quartz.job; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import org.quartz.Job; import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/annotations/DynamicService.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/annotation/DynamicService.java similarity index 88% rename from frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/annotations/DynamicService.java rename to frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/annotation/DynamicService.java index ad71167..9db9c37 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/annotations/DynamicService.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/annotation/DynamicService.java @@ -1,4 +1,4 @@ -package com.lvmoney.rabbitmq.ack.annotations; +package com.lvmoney.rabbitmq.ack.annotation; import java.lang.annotation.*; diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/config/BaseConfig.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/config/BaseConfig.java index fe5d986..665943c 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/config/BaseConfig.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/config/BaseConfig.java @@ -1,6 +1,6 @@ /** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/constant/RabbitmqConstant.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/constant/RabbitmqConstant.java index d5ce38d..35e8ae8 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/constant/RabbitmqConstant.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/constant/RabbitmqConstant.java @@ -1,6 +1,6 @@ package com.lvmoney.rabbitmq.ack.constant;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/FanoutReceiver.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/FanoutReceiver.java index dca1f82..e936d17 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/FanoutReceiver.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/FanoutReceiver.java @@ -1,6 +1,6 @@ package com.lvmoney.rabbitmq.ack.customer;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 @@ -8,11 +8,11 @@ package com.lvmoney.rabbitmq.ack.customer;/** import com.alibaba.fastjson.JSONObject; import com.rabbitmq.client.Channel; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.rabbitmq.ack.constant.RabbitmqConstant; import com.lvmoney.rabbitmq.ack.factory.HandMqServiceContext; -import com.lvmoney.rabbitmq.ack.utils.ContextBeanUtil; +import com.lvmoney.rabbitmq.ack.util.ContextBeanUtil; import com.lvmoney.rabbitmq.ack.vo.MessageVo; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/SimpleReceiver.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/SimpleReceiver.java index 89685ba..70cb0ca 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/SimpleReceiver.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/SimpleReceiver.java @@ -1,17 +1,17 @@ package com.lvmoney.rabbitmq.ack.customer;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 */ import com.alibaba.fastjson.JSONObject; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.rabbitmq.ack.constant.RabbitmqConstant; import com.lvmoney.rabbitmq.ack.factory.HandMqServiceContext; -import com.lvmoney.rabbitmq.ack.utils.ContextBeanUtil; +import com.lvmoney.rabbitmq.ack.util.ContextBeanUtil; import com.lvmoney.rabbitmq.ack.vo.MessageVo; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/TopicReceiver.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/TopicReceiver.java index 4f3ad6d..9125060 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/TopicReceiver.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/customer/TopicReceiver.java @@ -1,6 +1,6 @@ package com.lvmoney.rabbitmq.ack.customer;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 @@ -8,11 +8,11 @@ package com.lvmoney.rabbitmq.ack.customer;/** import com.alibaba.fastjson.JSONObject; import com.rabbitmq.client.Channel; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.rabbitmq.ack.constant.RabbitmqConstant; import com.lvmoney.rabbitmq.ack.factory.HandMqServiceContext; -import com.lvmoney.rabbitmq.ack.utils.ContextBeanUtil; +import com.lvmoney.rabbitmq.ack.util.ContextBeanUtil; import com.lvmoney.rabbitmq.ack.vo.MessageVo; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/FanoutSender.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/FanoutSender.java index 0bb9d8c..f6c99c5 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/FanoutSender.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/FanoutSender.java @@ -1,18 +1,17 @@ package com.lvmoney.rabbitmq.ack.provider;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 */ -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.rabbitmq.ack.constant.RabbitmqConstant; import com.lvmoney.rabbitmq.ack.ro.AckErrorRecordRo; import com.lvmoney.rabbitmq.ack.service.RabbitmqRedisService; import com.lvmoney.rabbitmq.ack.vo.MessageVo; import com.lvmoney.rabbitmq.ack.vo.MsgErrorVo; -import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/SimpleSender.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/SimpleSender.java index 337ee6c..cf45f4c 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/SimpleSender.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/SimpleSender.java @@ -1,19 +1,18 @@ package com.lvmoney.rabbitmq.ack.provider;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 */ -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.rabbitmq.ack.constant.RabbitmqConstant; import com.lvmoney.rabbitmq.ack.ro.AckErrorRecordRo; import com.lvmoney.rabbitmq.ack.service.RabbitmqRedisService; import com.lvmoney.rabbitmq.ack.vo.MessageVo; import com.lvmoney.rabbitmq.ack.vo.MsgErrorVo; -import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/TopicSender.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/TopicSender.java index 6cb83da..9c945d4 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/TopicSender.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/provider/TopicSender.java @@ -1,6 +1,6 @@ package com.lvmoney.rabbitmq.ack.provider;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 @@ -9,13 +9,12 @@ package com.lvmoney.rabbitmq.ack.provider;/** import java.util.ArrayList; import java.util.List; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.rabbitmq.ack.constant.RabbitmqConstant; import com.lvmoney.rabbitmq.ack.ro.AckErrorRecordRo; import com.lvmoney.rabbitmq.ack.service.RabbitmqRedisService; import com.lvmoney.rabbitmq.ack.vo.MessageVo; import com.lvmoney.rabbitmq.ack.vo.MsgErrorVo; -import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/ro/AckErrorRecordRo.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/ro/AckErrorRecordRo.java index f694eed..f6188a9 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/ro/AckErrorRecordRo.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/ro/AckErrorRecordRo.java @@ -1,6 +1,6 @@ package com.lvmoney.rabbitmq.ack.ro;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/RabbitmqRedisService.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/RabbitmqRedisService.java index b39a0ab..e99e773 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/RabbitmqRedisService.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/RabbitmqRedisService.java @@ -1,6 +1,6 @@ package com.lvmoney.rabbitmq.ack.service;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/impl/HandTestDataServiceImpl.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/impl/HandTestDataServiceImpl.java index e9f9d4e..b0a61ba 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/impl/HandTestDataServiceImpl.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/impl/HandTestDataServiceImpl.java @@ -8,7 +8,7 @@ package com.lvmoney.rabbitmq.ack.service.impl; -import com.lvmoney.rabbitmq.ack.annotations.DynamicService; +import com.lvmoney.rabbitmq.ack.annotation.DynamicService; import com.lvmoney.rabbitmq.ack.service.HandMqDataService; import com.lvmoney.rabbitmq.ack.vo.MessageVo; import org.springframework.stereotype.Service; diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/impl/RabbitmqRedisServiceImpl.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/impl/RabbitmqRedisServiceImpl.java index 3279441..02e6c7d 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/impl/RabbitmqRedisServiceImpl.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/service/impl/RabbitmqRedisServiceImpl.java @@ -1,6 +1,6 @@ package com.lvmoney.rabbitmq.ack.service.impl;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/utils/ContextBeanUtil.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/util/ContextBeanUtil.java similarity index 88% rename from frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/utils/ContextBeanUtil.java rename to frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/util/ContextBeanUtil.java index 610bd36..b87c077 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/utils/ContextBeanUtil.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/util/ContextBeanUtil.java @@ -1,13 +1,13 @@ -package com.lvmoney.rabbitmq.ack.utils;/** +package com.lvmoney.rabbitmq.ack.util;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 */ -import com.lvmoney.rabbitmq.ack.annotations.DynamicService; +import com.lvmoney.rabbitmq.ack.annotation.DynamicService; import com.lvmoney.rabbitmq.ack.factory.HandMqServiceContext; import com.lvmoney.rabbitmq.ack.service.HandMqDataService; diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/vo/MessageVo.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/vo/MessageVo.java index 0ee5719..7e3f173 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/vo/MessageVo.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/vo/MessageVo.java @@ -1,6 +1,6 @@ package com.lvmoney.rabbitmq.ack.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 diff --git a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/vo/MsgErrorVo.java b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/vo/MsgErrorVo.java index 879f3dc..d7131aa 100644 --- a/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/vo/MsgErrorVo.java +++ b/frame-rabbitmq-ack-support/src/main/java/com/lvmoney/rabbitmq/ack/vo/MsgErrorVo.java @@ -1,6 +1,6 @@ package com.lvmoney.rabbitmq.ack.vo;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/21 * Copyright xxxx科技有限公司 diff --git a/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotations/DynamicService.java b/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotation/DynamicService.java similarity index 92% rename from frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotations/DynamicService.java rename to frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotation/DynamicService.java index c2f16e3..ce66b7c 100644 --- a/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotations/DynamicService.java +++ b/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotation/DynamicService.java @@ -1,4 +1,4 @@ -package com.lvmoney.rabbitmq.annotations; +package com.lvmoney.rabbitmq.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotations/package-info.java b/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotation/package-info.java similarity index 84% rename from frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotations/package-info.java rename to frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotation/package-info.java index 0062c11..50fc802 100644 --- a/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotations/package-info.java +++ b/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/annotation/package-info.java @@ -1,6 +1,6 @@ /** * 描述: - * 包名:com.lvmoney.rabbitmq.annotations + * 包名:com.lvmoney.rabbitmq.annotation * 版本信息: 版本1.0 * 日期:2019年1月10日 下午5:17:22 * Copyright xxxx科技有限公司 @@ -20,4 +20,4 @@ * 2019年1月10日 下午5:17:22 */ -package com.lvmoney.rabbitmq.annotations; \ No newline at end of file +package com.lvmoney.rabbitmq.annotation; \ No newline at end of file diff --git a/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/customer/MqSynDataReceive.java b/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/customer/MqSynDataReceive.java index 60d4e74..fed947a 100644 --- a/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/customer/MqSynDataReceive.java +++ b/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/customer/MqSynDataReceive.java @@ -16,9 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.alibaba.fastjson.JSONObject; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.rabbitmq.annotations.DynamicService; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.rabbitmq.annotation.DynamicService; import com.lvmoney.rabbitmq.constant.RabbitmqConstant; import com.lvmoney.rabbitmq.factory.HandMqServiceContext; import com.lvmoney.rabbitmq.service.HandMqDataService; diff --git a/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/provider/MqSender.java b/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/provider/MqSender.java index 18f3b9e..9dbf66c 100644 --- a/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/provider/MqSender.java +++ b/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/provider/MqSender.java @@ -8,7 +8,7 @@ package com.lvmoney.rabbitmq.provider; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/service/impl/HandTestDataServiceImpl.java b/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/service/impl/HandTestDataServiceImpl.java index 0a0e4e2..cd70121 100644 --- a/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/service/impl/HandTestDataServiceImpl.java +++ b/frame-rabbitmq-support/src/main/java/com/lvmoney/rabbitmq/service/impl/HandTestDataServiceImpl.java @@ -10,7 +10,7 @@ package com.lvmoney.rabbitmq.service.impl; import org.springframework.stereotype.Service; -import com.lvmoney.rabbitmq.annotations.DynamicService; +import com.lvmoney.rabbitmq.annotation.DynamicService; import com.lvmoney.rabbitmq.service.HandMqDataService; import com.lvmoney.rabbitmq.vo.MqDataVo; diff --git a/frame-redis-support/src/main/java/com/lvmoney/redis/service/impl/BaseRedisServiceImpl.java b/frame-redis-support/src/main/java/com/lvmoney/redis/service/impl/BaseRedisServiceImpl.java index 000ca00..d25a2fd 100644 --- a/frame-redis-support/src/main/java/com/lvmoney/redis/service/impl/BaseRedisServiceImpl.java +++ b/frame-redis-support/src/main/java/com/lvmoney/redis/service/impl/BaseRedisServiceImpl.java @@ -8,7 +8,7 @@ package com.lvmoney.redis.service.impl; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.common.vo.Page; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -21,8 +21,8 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.redis.service.BaseRedisService; import javax.annotation.Resource; diff --git a/frame-router-support/src/main/java/com/lvmoney/router/annotations/AuthenticationValidated.java b/frame-router-support/src/main/java/com/lvmoney/router/annotation/AuthenticationValidated.java similarity index 88% rename from frame-router-support/src/main/java/com/lvmoney/router/annotations/AuthenticationValidated.java rename to frame-router-support/src/main/java/com/lvmoney/router/annotation/AuthenticationValidated.java index 7874e48..94e513d 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/annotations/AuthenticationValidated.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/annotation/AuthenticationValidated.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.router.annotations + * 包名:com.lvmoney.router.annotation * 版本信息: 版本1.0 * 日期:2019年1月9日 下午3:55:20 * Copyright xxxx科技有限公司 */ -package com.lvmoney.router.annotations; +package com.lvmoney.router.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/frame-router-support/src/main/java/com/lvmoney/router/annotations/ParamValidated.java b/frame-router-support/src/main/java/com/lvmoney/router/annotation/ParamValidated.java similarity index 88% rename from frame-router-support/src/main/java/com/lvmoney/router/annotations/ParamValidated.java rename to frame-router-support/src/main/java/com/lvmoney/router/annotation/ParamValidated.java index 15d03f4..91afd5e 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/annotations/ParamValidated.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/annotation/ParamValidated.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.router.annotations + * 包名:com.lvmoney.router.annotation * 版本信息: 版本1.0 * 日期:2019年1月2日 上午10:13:50 * Copyright xxxx科技有限公司 */ -package com.lvmoney.router.annotations; +package com.lvmoney.router.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/frame-router-support/src/main/java/com/lvmoney/router/annotations/PermissionValidated.java b/frame-router-support/src/main/java/com/lvmoney/router/annotation/PermissionValidated.java similarity index 88% rename from frame-router-support/src/main/java/com/lvmoney/router/annotations/PermissionValidated.java rename to frame-router-support/src/main/java/com/lvmoney/router/annotation/PermissionValidated.java index af81dd3..5cd57ec 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/annotations/PermissionValidated.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/annotation/PermissionValidated.java @@ -1,12 +1,12 @@ /** * 描述: - * 包名:com.lvmoney.router.annotations + * 包名:com.lvmoney.router.annotation * 版本信息: 版本1.0 * 日期:2019年1月9日 下午3:54:49 * Copyright xxxx科技有限公司 */ -package com.lvmoney.router.annotations; +package com.lvmoney.router.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/frame-router-support/src/main/java/com/lvmoney/router/annotations/RouterMethod.java b/frame-router-support/src/main/java/com/lvmoney/router/annotation/RouterMethod.java similarity index 93% rename from frame-router-support/src/main/java/com/lvmoney/router/annotations/RouterMethod.java rename to frame-router-support/src/main/java/com/lvmoney/router/annotation/RouterMethod.java index c94422c..16da88d 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/annotations/RouterMethod.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/annotation/RouterMethod.java @@ -1,4 +1,4 @@ -package com.lvmoney.router.annotations; +package com.lvmoney.router.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/frame-router-support/src/main/java/com/lvmoney/router/annotations/RouterService.java b/frame-router-support/src/main/java/com/lvmoney/router/annotation/RouterService.java similarity index 92% rename from frame-router-support/src/main/java/com/lvmoney/router/annotations/RouterService.java rename to frame-router-support/src/main/java/com/lvmoney/router/annotation/RouterService.java index c531c32..27331f0 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/annotations/RouterService.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/annotation/RouterService.java @@ -1,4 +1,4 @@ -package com.lvmoney.router.annotations; +package com.lvmoney.router.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/frame-router-support/src/main/java/com/lvmoney/router/annotations/package-info.java b/frame-router-support/src/main/java/com/lvmoney/router/annotation/package-info.java similarity index 85% rename from frame-router-support/src/main/java/com/lvmoney/router/annotations/package-info.java rename to frame-router-support/src/main/java/com/lvmoney/router/annotation/package-info.java index 0af2aef..555dadb 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/annotations/package-info.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/annotation/package-info.java @@ -1,6 +1,6 @@ /** * 描述: - * 包名:com.lvmoney.router.annotations + * 包名:com.lvmoney.router.annotation * 版本信息: 版本1.0 * 日期:2018年12月29日 下午1:54:16 * Copyright xxxx科技有限公司 @@ -20,4 +20,4 @@ * 2018年12月29日 下午1:54:16 */ -package com.lvmoney.router.annotations; \ No newline at end of file +package com.lvmoney.router.annotation; \ No newline at end of file diff --git a/frame-router-support/src/main/java/com/lvmoney/router/controller/ApiRouterController.java b/frame-router-support/src/main/java/com/lvmoney/router/controller/ApiRouterController.java index 7b311f0..5324e1d 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/controller/ApiRouterController.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/controller/ApiRouterController.java @@ -10,7 +10,7 @@ package com.lvmoney.router.controller; import java.util.List; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -19,10 +19,10 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.alibaba.fastjson.JSON; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.common.utils.vo.ResultData; -import com.lvmoney.jwt.annotations.NotToken; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.common.util.vo.ResultData; +import com.lvmoney.jwt.annotation.NotToken; import com.lvmoney.router.config.RouterMethodConfig; import com.lvmoney.router.config.AuthenticationValidatedConfig; import com.lvmoney.router.config.ParamValidatedConfig; @@ -185,7 +185,7 @@ public class ApiRouterController { /** * @describe: 错误处理 * @param: [ex, request] - * @return: com.lvmoney.common.utils.vo.ResultData + * @return: com.lvmoney.common.util.vo.ResultData * @author: lvmoney /XXXXXX科技有限公司 * 2019/9/9 14:09 */ @@ -203,7 +203,7 @@ public class ApiRouterController { /** * @describe: 执行方法获得返回数据 * @param: [request, uri, data] - * @return: com.lvmoney.common.utils.vo.ResultData + * @return: com.lvmoney.common.util.vo.ResultData * @author: lvmoney /XXXXXX科技有限公司 * 2019/9/9 14:08 */ diff --git a/frame-router-support/src/main/java/com/lvmoney/router/service/impl/AServiceImpl.java b/frame-router-support/src/main/java/com/lvmoney/router/service/impl/AServiceImpl.java index 1aa7c51..4d3b616 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/service/impl/AServiceImpl.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/service/impl/AServiceImpl.java @@ -10,13 +10,13 @@ package com.lvmoney.router.service.impl; import org.springframework.stereotype.Service; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; -import com.lvmoney.router.annotations.AuthenticationValidated; -import com.lvmoney.router.annotations.ParamValidated; -import com.lvmoney.router.annotations.PermissionValidated; -import com.lvmoney.router.annotations.RouterMethod; -import com.lvmoney.router.annotations.RouterService; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.router.annotation.AuthenticationValidated; +import com.lvmoney.router.annotation.ParamValidated; +import com.lvmoney.router.annotation.PermissionValidated; +import com.lvmoney.router.annotation.RouterMethod; +import com.lvmoney.router.annotation.RouterService; import com.lvmoney.router.service.AService; import com.lvmoney.router.vo.req.NormalReqVo; import com.lvmoney.router.vo.req.TestReqVo; diff --git a/frame-router-support/src/main/java/com/lvmoney/router/spring/ApiServiceRegistryProcessor.java b/frame-router-support/src/main/java/com/lvmoney/router/spring/ApiServiceRegistryProcessor.java index 0fc8300..6044df9 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/spring/ApiServiceRegistryProcessor.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/spring/ApiServiceRegistryProcessor.java @@ -13,8 +13,8 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.stereotype.Component; -import com.lvmoney.router.annotations.RouterMethod; -import com.lvmoney.router.annotations.RouterService; +import com.lvmoney.router.annotation.RouterMethod; +import com.lvmoney.router.annotation.RouterService; import com.lvmoney.router.config.RouterMethodConfig; import com.lvmoney.router.config.RouterServiceConfig; diff --git a/frame-router-support/src/main/java/com/lvmoney/router/spring/RouterServiceHolder.java b/frame-router-support/src/main/java/com/lvmoney/router/spring/RouterServiceHolder.java index 4668749..0cf6c06 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/spring/RouterServiceHolder.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/spring/RouterServiceHolder.java @@ -8,9 +8,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.lvmoney.router.config.PermissionValidatedConfig; -import com.lvmoney.router.annotations.AuthenticationValidated; -import com.lvmoney.router.annotations.ParamValidated; -import com.lvmoney.router.annotations.PermissionValidated; +import com.lvmoney.router.annotation.AuthenticationValidated; +import com.lvmoney.router.annotation.ParamValidated; +import com.lvmoney.router.annotation.PermissionValidated; import com.lvmoney.router.config.AuthenticationValidatedConfig; import com.lvmoney.router.config.RouterMethodConfig; import com.lvmoney.router.config.RouterServiceConfig; @@ -61,11 +61,11 @@ public class RouterServiceHolder { public ParamValidatedConfig findValidateByUri(String uri) { RouterMethodConfig routerMethodConfig = this.findMethodByUri(uri); -// Annotation[] annotations = RouterMethodConfig.getMethod().getAnnotations(); +// Annotation[] annotation = RouterMethodConfig.getMethod().getAnnotations(); // boolean isValidate=false; -// for(Annotation annotations:annotations){ -// if(annotations instanceof ValidateMethod){ -// ValidateMethod ValidateMethod = (ValidateMethod)annotations; +// for(Annotation annotation:annotation){ +// if(annotation instanceof ValidateMethod){ +// ValidateMethod ValidateMethod = (ValidateMethod)annotation; // isValidate = ValidateMethod.isValidate(); // break; // } diff --git a/frame-router-support/src/main/java/com/lvmoney/router/web/BuildRequestHandler.java b/frame-router-support/src/main/java/com/lvmoney/router/web/BuildRequestHandler.java index d88ad38..39cc4b3 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/web/BuildRequestHandler.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/web/BuildRequestHandler.java @@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.core.Ordered; -import com.lvmoney.common.exceptions.FrameRuntimeException; +import com.lvmoney.common.exception.FrameRuntimeException; /** * @describe： 构建请求处理链 所有实现必须被mvc容器管理 返回较小的order值的实现排在处理链更前方 diff --git a/frame-router-support/src/main/java/com/lvmoney/router/web/GlobalParamsHandler.java b/frame-router-support/src/main/java/com/lvmoney/router/web/GlobalParamsHandler.java index d022f2d..7d06937 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/web/GlobalParamsHandler.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/web/GlobalParamsHandler.java @@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.core.Ordered; import org.springframework.stereotype.Component; -import com.lvmoney.common.exceptions.FrameRuntimeException; +import com.lvmoney.common.exception.FrameRuntimeException; import com.lvmoney.router.vo.global.GlobalPhoneParams; import com.lvmoney.router.vo.global.GlobalPhoneParamsAware; diff --git a/frame-router-support/src/main/java/com/lvmoney/router/web/HibernateValidationHandler.java b/frame-router-support/src/main/java/com/lvmoney/router/web/HibernateValidationHandler.java index ee5875f..a1af3c9 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/web/HibernateValidationHandler.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/web/HibernateValidationHandler.java @@ -1,6 +1,6 @@ /** * 描述: - * 包名:com.lvmoney.router.utils + * 包名:com.lvmoney.router.util * 版本信息: 版本1.0 * 日期:2018年12月29日 下午5:12:15 * Copyright xxxx科技有限公司 @@ -21,8 +21,8 @@ import javax.validation.Validator; import org.hibernate.validator.HibernateValidator; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; public class HibernateValidationHandler { diff --git a/frame-router-support/src/main/java/com/lvmoney/router/web/JwtTokenHandler.java b/frame-router-support/src/main/java/com/lvmoney/router/web/JwtTokenHandler.java index 654e54b..86b4143 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/web/JwtTokenHandler.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/web/JwtTokenHandler.java @@ -13,8 +13,8 @@ import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.exceptions.JWTVerificationException; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.jwt.constant.JwtConstant; import com.lvmoney.jwt.service.JwtRedisService; import com.lvmoney.jwt.vo.UserVo; diff --git a/frame-router-support/src/main/java/com/lvmoney/router/web/ShiroAuthHandler.java b/frame-router-support/src/main/java/com/lvmoney/router/web/ShiroAuthHandler.java index 7de3c7c..7f63855 100644 --- a/frame-router-support/src/main/java/com/lvmoney/router/web/ShiroAuthHandler.java +++ b/frame-router-support/src/main/java/com/lvmoney/router/web/ShiroAuthHandler.java @@ -8,12 +8,12 @@ package com.lvmoney.router.web; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.shiro.constant.ShiroConstant; import com.lvmoney.shiro.properties.ShiroConfigProp; import com.lvmoney.shiro.service.ShiroRedisService; -import com.lvmoney.shiro.utils.FilterMapUtil; +import com.lvmoney.shiro.util.FilterMapUtil; import com.lvmoney.shiro.vo.UserVo; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.UsernamePasswordToken; diff --git a/frame-shiro-support/src/main/java/com/lvmoney/shiro/annotations/ShiroResouce.java b/frame-shiro-support/src/main/java/com/lvmoney/shiro/annotation/ShiroResouce.java similarity index 95% rename from frame-shiro-support/src/main/java/com/lvmoney/shiro/annotations/ShiroResouce.java rename to frame-shiro-support/src/main/java/com/lvmoney/shiro/annotation/ShiroResouce.java index 6c10907..86ae200 100644 --- a/frame-shiro-support/src/main/java/com/lvmoney/shiro/annotations/ShiroResouce.java +++ b/frame-shiro-support/src/main/java/com/lvmoney/shiro/annotation/ShiroResouce.java @@ -1,4 +1,4 @@ -package com.lvmoney.shiro.annotations;/** +package com.lvmoney.shiro.annotation;/** * 描述: * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 diff --git a/frame-shiro-support/src/main/java/com/lvmoney/shiro/filter/FrameShiroFilter.java b/frame-shiro-support/src/main/java/com/lvmoney/shiro/filter/FrameShiroFilter.java index e441586..7f70ca7 100644 --- a/frame-shiro-support/src/main/java/com/lvmoney/shiro/filter/FrameShiroFilter.java +++ b/frame-shiro-support/src/main/java/com/lvmoney/shiro/filter/FrameShiroFilter.java @@ -1,11 +1,11 @@ package com.lvmoney.shiro.filter; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.shiro.constant.ShiroConstant; import com.lvmoney.shiro.properties.ShiroConfigProp; import com.lvmoney.shiro.service.ShiroRedisService; -import com.lvmoney.shiro.utils.FilterMapUtil; +import com.lvmoney.shiro.util.FilterMapUtil; import com.lvmoney.shiro.vo.ShiroUriVo; import com.lvmoney.shiro.vo.UserVo; import org.apache.shiro.SecurityUtils; diff --git a/frame-shiro-support/src/main/java/com/lvmoney/shiro/init/AfterStartupInit.java b/frame-shiro-support/src/main/java/com/lvmoney/shiro/init/AfterStartupInit.java index bf0e7d4..9bce698 100644 --- a/frame-shiro-support/src/main/java/com/lvmoney/shiro/init/AfterStartupInit.java +++ b/frame-shiro-support/src/main/java/com/lvmoney/shiro/init/AfterStartupInit.java @@ -8,7 +8,7 @@ package com.lvmoney.shiro.init;/** import com.lvmoney.common.constant.CommonConstant; -import com.lvmoney.shiro.annotations.ShiroResouce; +import com.lvmoney.shiro.annotation.ShiroResouce; import com.lvmoney.shiro.ro.ShiroServerRo; import com.lvmoney.shiro.service.ShiroRedisService; import com.lvmoney.shiro.vo.SysServiceDataVo; diff --git a/frame-shiro-support/src/main/java/com/lvmoney/shiro/realm/FrameShiroRealm.java b/frame-shiro-support/src/main/java/com/lvmoney/shiro/realm/FrameShiroRealm.java index 93517bf..0445fa4 100644 --- a/frame-shiro-support/src/main/java/com/lvmoney/shiro/realm/FrameShiroRealm.java +++ b/frame-shiro-support/src/main/java/com/lvmoney/shiro/realm/FrameShiroRealm.java @@ -10,8 +10,8 @@ import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; import org.springframework.beans.factory.annotation.Autowired; -import com.lvmoney.common.exceptions.BusinessException; -import com.lvmoney.common.exceptions.CommonException; +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; import com.lvmoney.shiro.vo.ShiroDataVo; import com.lvmoney.shiro.vo.UserVo; import com.lvmoney.shiro.service.ShiroRedisService; diff --git a/frame-shiro-support/src/main/java/com/lvmoney/shiro/service/impl/ShiroRedisServiceImpl.java b/frame-shiro-support/src/main/java/com/lvmoney/shiro/service/impl/ShiroRedisServiceImpl.java index 13860da..6e56f42 100644 --- a/frame-shiro-support/src/main/java/com/lvmoney/shiro/service/impl/ShiroRedisServiceImpl.java +++ b/frame-shiro-support/src/main/java/com/lvmoney/shiro/service/impl/ShiroRedisServiceImpl.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.lvmoney.common.constant.CommonConstant; import com.lvmoney.common.ro.UserRo; -import com.lvmoney.common.utils.JsonUtil; +import com.lvmoney.common.util.JsonUtil; import com.lvmoney.redis.service.BaseRedisService; import com.lvmoney.shiro.constant.ShiroConstant; import com.lvmoney.shiro.ro.ShiroDataRo; diff --git a/frame-shiro-support/src/main/java/com/lvmoney/shiro/utils/FilterMapUtil.java b/frame-shiro-support/src/main/java/com/lvmoney/shiro/util/FilterMapUtil.java similarity index 87% rename from frame-shiro-support/src/main/java/com/lvmoney/shiro/utils/FilterMapUtil.java rename to frame-shiro-support/src/main/java/com/lvmoney/shiro/util/FilterMapUtil.java index dd436ac..d63c8c1 100644 --- a/frame-shiro-support/src/main/java/com/lvmoney/shiro/utils/FilterMapUtil.java +++ b/frame-shiro-support/src/main/java/com/lvmoney/shiro/util/FilterMapUtil.java @@ -1,16 +1,16 @@ /** * 描述: - * 包名:com.lvmoney.shiro.utils + * 包名:com.lvmoney.shiro.util * 版本信息: 版本1.0 * 日期:2019年1月10日 下午4:23:28 * Copyright xxxx科技有限公司 */ -package com.lvmoney.shiro.utils; +package com.lvmoney.shiro.util; import java.util.Map; -import com.lvmoney.common.utils.WildcardUtil; +import com.lvmoney.common.util.WildcardUtil; /** * @describe： diff --git a/frame-shiro-support/src/main/java/com/lvmoney/shiro/utils/RequestUtils.java b/frame-shiro-support/src/main/java/com/lvmoney/shiro/util/RequestUtils.java similarity index 95% rename from frame-shiro-support/src/main/java/com/lvmoney/shiro/utils/RequestUtils.java rename to frame-shiro-support/src/main/java/com/lvmoney/shiro/util/RequestUtils.java index a6400a0..af2aa59 100644 --- a/frame-shiro-support/src/main/java/com/lvmoney/shiro/utils/RequestUtils.java +++ b/frame-shiro-support/src/main/java/com/lvmoney/shiro/util/RequestUtils.java @@ -1,4 +1,4 @@ -package com.lvmoney.shiro.utils; +package com.lvmoney.shiro.util; import com.lvmoney.shiro.vo.UserVo; import org.apache.shiro.SecurityUtils; diff --git a/frame-signature-support/src/main/java/com/lvmoney/signature/application/Application.java b/frame-signature-support/src/main/java/com/lvmoney/signature/application/Application.java index 168f8b0..45ca687 100644 --- a/frame-signature-support/src/main/java/com/lvmoney/signature/application/Application.java +++ b/frame-signature-support/src/main/java/com/lvmoney/signature/application/Application.java @@ -1,6 +1,6 @@ package com.lvmoney.signature.application;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 diff --git a/frame-signature-support/src/main/java/com/lvmoney/signature/application/Test1.java b/frame-signature-support/src/main/java/com/lvmoney/signature/application/Test1.java index 3dd9f59..6299f93 100644 --- a/frame-signature-support/src/main/java/com/lvmoney/signature/application/Test1.java +++ b/frame-signature-support/src/main/java/com/lvmoney/signature/application/Test1.java @@ -1,6 +1,6 @@ package com.lvmoney.signature.application;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 diff --git a/frame-signature-support/src/main/java/com/lvmoney/signature/application/Test2.java b/frame-signature-support/src/main/java/com/lvmoney/signature/application/Test2.java index 22e9803..d7a600d 100644 --- a/frame-signature-support/src/main/java/com/lvmoney/signature/application/Test2.java +++ b/frame-signature-support/src/main/java/com/lvmoney/signature/application/Test2.java @@ -1,6 +1,6 @@ package com.lvmoney.signature.application;/** * 描述: - * 包名:com.lvmoney.jwt.annotations + * 包名:com.lvmoney.jwt.annotation * 版本信息: 版本1.0 * 日期:2019/1/22 * Copyright xxxx科技有限公司 -- Gitee From 10eb73947017404e0838d5e5fb080e2a4ba4d437 Mon Sep 17 00:00:00 2001 From: lvmoney Date: Mon, 30 Sep 2019 16:44:20 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0k8s1.16.0&isti?= =?UTF-8?q?o1.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame-customer-support/pom.xml | 169 +++++++++--------- .../frame-provider-support/pom.xml | 10 +- .../src/main/resources/application-dev.yml | 2 - .../src/main/resources/application.yml | 11 +- 4 files changed, 92 insertions(+), 100 deletions(-) delete mode 100644 frame-k8s-support/frame-provider-support/src/main/resources/application-dev.yml diff --git a/frame-k8s-support/frame-customer-support/pom.xml b/frame-k8s-support/frame-customer-support/pom.xml index a179a56..d2f8d1a 100644 --- a/frame-k8s-support/frame-customer-support/pom.xml +++ b/frame-k8s-support/frame-customer-support/pom.xml @@ -49,89 +49,90 @@ 0.0.1-SNAPSHOT - + + + com.lvmoney.customer.application.CustomerApplication + + + + + repackage + + + + + + com.spotify + docker-maven-plugin + 0.4.3 + + + build-image + package + + build + + + + image-tag + package + + tag + + + ${dockerImageName} + ${dockerImageTag} + + + + package-push + package + + push + + + ${dockerImageTag} + + + + + ${dockerImageName} + java + + ${project.basedir}/src/main/resources + ${dockerHost} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + - - - src/main/resources - true - - **/** - - - - src/main/java - - **/*.java - - - - --> + + + + + src/main/resources + true + + **/** + + + + src/main/java + + **/*.java + + + + \ No newline at end of file diff --git a/frame-k8s-support/frame-provider-support/pom.xml b/frame-k8s-support/frame-provider-support/pom.xml index e938d58..c0bdf6c 100644 --- a/frame-k8s-support/frame-provider-support/pom.xml +++ b/frame-k8s-support/frame-provider-support/pom.xml @@ -89,8 +89,8 @@ tag - ${docker.image.name} - ${docker.image.tag} + ${dockerImageName} + ${dockerImageTag} @@ -100,16 +100,16 @@ push - ${docker.image.tag} + ${dockerImageTag} - ${docker.image.name} + ${dockerImageName} java ${project.basedir}/src/main/resources - ${docker.host} + ${dockerHost} / diff --git a/frame-k8s-support/frame-provider-support/src/main/resources/application-dev.yml b/frame-k8s-support/frame-provider-support/src/main/resources/application-dev.yml deleted file mode 100644 index 139597f..0000000 --- a/frame-k8s-support/frame-provider-support/src/main/resources/application-dev.yml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/frame-k8s-support/frame-provider-support/src/main/resources/application.yml b/frame-k8s-support/frame-provider-support/src/main/resources/application.yml index 9b7ee9c..29bf109 100644 --- a/frame-k8s-support/frame-provider-support/src/main/resources/application.yml +++ b/frame-k8s-support/frame-provider-support/src/main/resources/application.yml @@ -6,14 +6,7 @@ spring: redis: database: 2 port: 6379 - host: localhost - cloud: - config: - label: master - #对应Config Server所获取的配置文件的{profile}，这里表示获取开发版的配置信息 - profile: dev - #Config Server的地址 - uri: http://localhost:8974/ + host: 192.168.171 istio: namespace: lvmoney docker: @@ -51,5 +44,5 @@ istio: ip: 192.168.1.181 operating: - environment: local + environment: istio internal: internal \ No newline at end of file -- Gitee From e5337777857570046e6b220dc9e8dc119686c492 Mon Sep 17 00:00:00 2001 From: lvmoney Date: Tue, 8 Oct 2019 11:28:56 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canal/redis/client/SimpleCanalClient.java | 8 ++++-- .../canal/redis/properties/CanalProp.java | 26 +++++++++++++++---- .../src/main/resources/application.yml | 3 ++- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/client/SimpleCanalClient.java b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/client/SimpleCanalClient.java index f6080ad..2c31cbf 100644 --- a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/client/SimpleCanalClient.java +++ b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/client/SimpleCanalClient.java @@ -50,11 +50,15 @@ public class SimpleCanalClient extends AbstractCanalClient { */ public SimpleCanalClient(CanalProp canalProp, HandListenerContext handListenerContext) { super(canalProp); - //这边上可能需要调整，紧跟德叔脚步走，默认核心线程数5个，最大线程数20个，线程两分钟分钟不执行就。。。 + //这边上可能需要调整，紧跟核数脚步走，默认核心线程数5个，最大线程数20个，线程两分钟分钟不执行就。。。 // executor = new ThreadPoolExecutor(5, 20, // 120L, TimeUnit.SECONDS, // new SynchronousQueue<>(), Executors.defaultThreadFactory()); - executorService = Executors.newFixedThreadPool(canalProp.getPoolSize()); + + executorService = new ThreadPoolExecutor(canalProp.getInitPoolSize(), canalProp.getMaxPoolSize(), + 120L, TimeUnit.SECONDS, + new SynchronousQueue<>(), new ThreadPoolExecutor.AbortPolicy()); +// executorService = Executors.newFixedThreadPool(canalProp.getPoolSize()); //初始化监听器 this.handListenerContext = handListenerContext; initListeners(); diff --git a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/properties/CanalProp.java b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/properties/CanalProp.java index 6091690..da40843 100644 --- a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/properties/CanalProp.java +++ b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/java/com/lvmoney/bigdata/canal/redis/properties/CanalProp.java @@ -28,15 +28,31 @@ import java.util.Set; @Order(Ordered.HIGHEST_PRECEDENCE) @ConfigurationProperties(prefix = "canal.server") public class CanalProp { - public int getPoolSize() { - return poolSize; + + /** + * 线程池最大连接数 + */ + private int maxPoolSize; + /** + * 线程池初始化连接数 + */ + private int initPoolSize; + + public int getMaxPoolSize() { + return maxPoolSize; + } + + public void setMaxPoolSize(int maxPoolSize) { + this.maxPoolSize = maxPoolSize; } - public void setPoolSize(int poolSize) { - this.poolSize = poolSize; + public int getInitPoolSize() { + return initPoolSize; } - private int poolSize = 100; + public void setInitPoolSize(int initPoolSize) { + this.initPoolSize = initPoolSize; + } /** * 配置信息 diff --git a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/resources/application.yml b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/resources/application.yml index 99b1b5c..8f4c86c 100644 --- a/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/resources/application.yml +++ b/frame-bigdata-support/frame-bigdata-canal-support/frame-bigdata-cannal-redis-support/src/main/resources/application.yml @@ -11,7 +11,8 @@ canal: batchSize: 1000 acquireInterval: 1000 retryCount: 20 - poolSize: 100 + maxPoolSize: 20 + initPoolSize: 5 spring: main: allow-bean-definition-overriding: true -- Gitee From 5b4d50c9199985618d014e296542b788ff59660c Mon Sep 17 00:00:00 2001 From: lvmoney <365619103@qq.com> Date: Sun, 13 Oct 2019 17:28:16 +0800 Subject: [PATCH 08/18] =?UTF-8?q?istio=20deployment=20=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lvmoney/k8s/base/constant/BaseConstant.java | 2 +- .../k8s/base/service/impl/YamlServiceImpl.java | 7 +++++++ .../com/lvmoney/k8s/base/vo/jyaml/DeploymentSpec.java | 2 +- .../k8s/base/vo/jyaml/DeploymentSpecSelector.java | 10 ++++++++++ .../com/lvmoney/k8s/base/vo/jyaml/MatchLabels.java | 11 +++++++++++ 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/DeploymentSpecSelector.java create mode 100644 frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/MatchLabels.java diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/constant/BaseConstant.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/constant/BaseConstant.java index a24a6e6..87de67a 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/constant/BaseConstant.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/constant/BaseConstant.java @@ -19,7 +19,7 @@ public class BaseConstant { /** * Yaml 文件后缀 */ - public static final String YAML_SUFFIX = ".Yaml"; + public static final String YAML_SUFFIX = ".yaml"; public static final String YAML_FILE_PATH = System.getProperty("user.dir") + FILE_SEPARATOR + "data" + FILE_SEPARATOR + "yaml"; diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java index 060ae74..6ad4ce8 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java @@ -154,8 +154,15 @@ public class YamlServiceImpl implements YamlService { meLabels.setVersion(version); meLabels.setApp(applicationName); dMetadata.setLabels(meLabels); + + MatchLabels matchLabels = new MatchLabels(); + matchLabels.setApp(applicationName); + matchLabels.setVersion(version); + DeploymentSpecSelector selector = new DeploymentSpecSelector(); + selector.setMatchLabels(matchLabels); DeploymentSpec deploymentSpec = new DeploymentSpec(); deploymentSpec.setReplicas(replicas); + deploymentSpec.setSelector(selector); Template template = new Template(); Metadata tMetadata = new Metadata(); TemplateSpec templateSpec = new TemplateSpec(); diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/DeploymentSpec.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/DeploymentSpec.java index 0185ffa..5377e4e 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/DeploymentSpec.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/DeploymentSpec.java @@ -20,6 +20,6 @@ import java.io.Serializable; public class DeploymentSpec implements Serializable { private static final long serialVersionUID = -3547019119340747457L; private int replicas; - + DeploymentSpecSelector selector; private Template template; } diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/DeploymentSpecSelector.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/DeploymentSpecSelector.java new file mode 100644 index 0000000..b55e3d7 --- /dev/null +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/DeploymentSpecSelector.java @@ -0,0 +1,10 @@ +package com.lvmoney.k8s.base.vo.jyaml; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class DeploymentSpecSelector implements Serializable { + private MatchLabels matchLabels; +} diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/MatchLabels.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/MatchLabels.java new file mode 100644 index 0000000..c35dd76 --- /dev/null +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/vo/jyaml/MatchLabels.java @@ -0,0 +1,11 @@ +package com.lvmoney.k8s.base.vo.jyaml; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MatchLabels implements Serializable { + private String app; + private String version; +} -- Gitee From fddd8fd83a8ee2c252cb2ddbe60a6053e8c2885c Mon Sep 17 00:00:00 2001 From: lvmoney <365619103@qq.com> Date: Sun, 13 Oct 2019 19:43:51 +0800 Subject: [PATCH 09/18] =?UTF-8?q?istio=20deployment=20=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java | 2 +- .../frame-provider-support/src/main/resources/application.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java index 6ad4ce8..ffcf2fe 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/YamlServiceImpl.java @@ -172,7 +172,7 @@ public class YamlServiceImpl implements YamlService { tMetadata.setLabels(tLabels); Containers containers = new Containers(); containers.setName(applicationName); - String dockerImage = PomUtil.getDockerInfo().getDockerImageName(); + String dockerImage = PomUtil.getDockerInfo().getDockerImageTag(); containers.setImage(dockerImage); if (pullPolicy.equals(DockerPull.IfNotPresent.getValue())) { containers.setImagePullPolicy(DockerPull.IfNotPresent.getValue()); diff --git a/frame-k8s-support/frame-provider-support/src/main/resources/application.yml b/frame-k8s-support/frame-provider-support/src/main/resources/application.yml index 29bf109..8aecb46 100644 --- a/frame-k8s-support/frame-provider-support/src/main/resources/application.yml +++ b/frame-k8s-support/frame-provider-support/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: redis: database: 2 port: 6379 - host: 192.168.171 + host: 192.168.1.171 istio: namespace: lvmoney docker: @@ -17,7 +17,7 @@ istio: yaml: cover: true replicas: 1 - version: v2 + version: v1 destination: support: true v1: 90 -- Gitee From 520ae65e0f6e3a0897ab6ddc88a59412858615a6 Mon Sep 17 00:00:00 2001 From: lvmoney <365619103@qq.com> Date: Sun, 13 Oct 2019 20:27:18 +0800 Subject: [PATCH 10/18] =?UTF-8?q?istio=20deployment=20=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lvmoney/k8s/base/util/PomUtil.java | 2 +- .../frame-provider-support/src/main/resources/Dockerfile | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 frame-k8s-support/frame-provider-support/src/main/resources/Dockerfile diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/PomUtil.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/PomUtil.java index 7d9f093..9e19f80 100644 --- a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/PomUtil.java +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/util/PomUtil.java @@ -63,7 +63,7 @@ public class PomUtil { String namespace = model.getProperties().getProperty(NAMESPACE); dockerInfo.setDockerFileName(projectArtifactId + "-" + projectVersion); dockerInfo.setDockerImageName(projectArtifactId + ":" + projectVersion); - dockerInfo.setDockerImageTag(dockerRegistryIp + ":" + dockerTagPort + FILE_SEPARATOR + namespace + FILE_SEPARATOR + projectArtifactId + ":" + projectVersion); + dockerInfo.setDockerImageTag(dockerRegistryIp + ":" + dockerTagPort + "/" + namespace + "/" + projectArtifactId + ":" + projectVersion); } catch (IOException e) { LOGGER.error("获得docker配置信息报错:{}", e.getMessage()); } catch (XmlPullParserException e) { diff --git a/frame-k8s-support/frame-provider-support/src/main/resources/Dockerfile b/frame-k8s-support/frame-provider-support/src/main/resources/Dockerfile deleted file mode 100644 index 06c04d4..0000000 --- a/frame-k8s-support/frame-provider-support/src/main/resources/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM java:8 -VOLUME /home -ADD frame-provider-support-0.0.2-SNAPSHOT.jar app1174580849316990976.jar -RUN sh -c 'touch /app1174580849316990976.jar' -ENV JAVA_OPTS="" -ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app1174580849316990976.jar" ] \ No newline at end of file -- Gitee From 1edabaa135bd358883f9e6c14b412c41a8ba4a5b Mon Sep 17 00:00:00 2001 From: lvmoney Date: Tue, 15 Oct 2019 16:13:07 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E9=85=8D=E5=90=88prometheus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame-provider-support/pom.xml | 147 +++++++++--------- .../application/ProviderApplication.java | 9 ++ 2 files changed, 85 insertions(+), 71 deletions(-) diff --git a/frame-k8s-support/frame-provider-support/pom.xml b/frame-k8s-support/frame-provider-support/pom.xml index c0bdf6c..72b1a4e 100644 --- a/frame-k8s-support/frame-provider-support/pom.xml +++ b/frame-k8s-support/frame-provider-support/pom.xml @@ -43,83 +43,88 @@ frame-base-support 0.0.1-SNAPSHOT - - org.springframework.cloud - spring-cloud-starter-config - 2.1.0.RELEASE + io.micrometer + micrometer-registry-prometheus + 1.2.0 + + + org.springframework.boot + spring-boot-actuator-autoconfigure + 2.1.6.RELEASE + compile - - - org.springframework.boot - spring-boot-maven-plugin - - - - com.lvmoney.provider.application.ProviderApplication - - - - - repackage - - - - - - com.spotify - docker-maven-plugin - 0.4.3 - - - build-image - package - - build - - - - image-tag - package - - tag - - - ${dockerImageName} - ${dockerImageTag} - - - - package-push - package - - push - - - ${dockerImageTag} - - - - - ${dockerImageName} - java - - ${project.basedir}/src/main/resources - ${dockerHost} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - - + + + org.springframework.boot + spring-boot-maven-plugin + + + + com.lvmoney.provider.application.ProviderApplication + + + + + repackage + + + + + + com.spotify + docker-maven-plugin + 0.4.3 + + + build-image + package + + build + + + + image-tag + package + + tag + + + ${dockerImageName} + ${dockerImageTag} + + + + package-push + package + + push + + + ${dockerImageTag} + + + + + ${dockerImageName} + java + + ${project.basedir}/src/main/resources + ${dockerHost} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + + diff --git a/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/application/ProviderApplication.java b/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/application/ProviderApplication.java index b4847b4..1bced6b 100644 --- a/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/application/ProviderApplication.java +++ b/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/application/ProviderApplication.java @@ -7,8 +7,12 @@ package com.lvmoney.provider.application;/** */ +import io.micrometer.core.instrument.MeterRegistry; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; +import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; /** * @describe： @@ -21,4 +25,9 @@ public class ProviderApplication { SpringApplication.run(ProviderApplication.class, args); } + @Bean + MeterRegistryCustomizer configurer(@Value("${spring.application.name}") String applicationName) { + return (registry) -> registry.config().commonTags("application", applicationName); + } + } -- Gitee From fe24bd96ab95fee7fb2d6aba30195e04045eeb8f Mon Sep 17 00:00:00 2001 From: lvmoney Date: Tue, 15 Oct 2019 16:15:34 +0800 Subject: [PATCH 12/18] =?UTF-8?q?prometheus=20=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frame-k8s-support/frame-provider-support/src/main/resources/application.yml b/frame-k8s-support/frame-provider-support/src/main/resources/application.yml index 8aecb46..fa15eca 100644 --- a/frame-k8s-support/frame-provider-support/src/main/resources/application.yml +++ b/frame-k8s-support/frame-provider-support/src/main/resources/application.yml @@ -45,4 +45,13 @@ istio: operating: environment: istio - internal: internal \ No newline at end of file + internal: internal + +management: + endpoints: + web: + exposure: + include: "*" + metrics: + tags: + application: ${spring.application.name} \ No newline at end of file -- Gitee From cf17a68e66816e1f1a7c3296d6d40a2d66dfd87e Mon Sep 17 00:00:00 2001 From: lvmoney Date: Wed, 16 Oct 2019 16:47:25 +0800 Subject: [PATCH 13/18] =?UTF-8?q?prometheus=20=E7=89=88=E6=9C=AC=E5=AF=B9?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frame-k8s-support/frame-provider-support/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frame-k8s-support/frame-provider-support/pom.xml b/frame-k8s-support/frame-provider-support/pom.xml index 72b1a4e..9b58917 100644 --- a/frame-k8s-support/frame-provider-support/pom.xml +++ b/frame-k8s-support/frame-provider-support/pom.xml @@ -51,7 +51,7 @@ org.springframework.boot spring-boot-actuator-autoconfigure - 2.1.6.RELEASE + 2.1.0.RELEASE compile -- Gitee From 37369ef941b900e695c989eb10e626b40fa7db52 Mon Sep 17 00:00:00 2001 From: lvmoney Date: Wed, 16 Oct 2019 16:54:47 +0800 Subject: [PATCH 14/18] =?UTF-8?q?prometheus=20=E5=8D=95=E7=8B=AC=E4=BD=BF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frame-k8s-support/frame-base-support/pom.xml | 12 ++++++++ .../k8s/base/config/BasePrometheusConfig.java | 28 +++++++++++++++++++ .../frame-provider-support/pom.xml | 12 +------- .../application/ProviderApplication.java | 8 ------ 4 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/config/BasePrometheusConfig.java diff --git a/frame-k8s-support/frame-base-support/pom.xml b/frame-k8s-support/frame-base-support/pom.xml index bbffca6..c39a005 100644 --- a/frame-k8s-support/frame-base-support/pom.xml +++ b/frame-k8s-support/frame-base-support/pom.xml @@ -73,6 +73,18 @@ 3.0 + + io.micrometer + micrometer-registry-prometheus + 1.2.0 + + + org.springframework.boot + spring-boot-actuator-autoconfigure + 2.1.0.RELEASE + compile + + \ No newline at end of file diff --git a/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/config/BasePrometheusConfig.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/config/BasePrometheusConfig.java new file mode 100644 index 0000000..6c3bf58 --- /dev/null +++ b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/config/BasePrometheusConfig.java @@ -0,0 +1,28 @@ +package com.lvmoney.k8s.base.config;/** + * 描述: + * 包名:com.lvmoney.k8s.base.config + * 版本信息: 版本1.0 + * 日期:2019/10/16 + * Copyright XXXXXX科技有限公司 + */ + + +import io.micrometer.core.instrument.MeterRegistry; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @describe： + * @author: lvmoney/XXXXXX科技有限公司 + * @version:v1.0 2019/10/16 16:49 + */ +@Configuration +public class BasePrometheusConfig { + @Bean + MeterRegistryCustomizer configurer(@Value("${spring.application.name}") String applicationName) { + return (registry) -> registry.config().commonTags("application", applicationName); + } + +} diff --git a/frame-k8s-support/frame-provider-support/pom.xml b/frame-k8s-support/frame-provider-support/pom.xml index 9b58917..75ddd0a 100644 --- a/frame-k8s-support/frame-provider-support/pom.xml +++ b/frame-k8s-support/frame-provider-support/pom.xml @@ -43,17 +43,7 @@ frame-base-support 0.0.1-SNAPSHOT - - io.micrometer - micrometer-registry-prometheus - 1.2.0 - - - org.springframework.boot - spring-boot-actuator-autoconfigure - 2.1.0.RELEASE - compile - + diff --git a/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/application/ProviderApplication.java b/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/application/ProviderApplication.java index 1bced6b..779b0b3 100644 --- a/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/application/ProviderApplication.java +++ b/frame-k8s-support/frame-provider-support/src/main/java/com/lvmoney/provider/application/ProviderApplication.java @@ -7,12 +7,8 @@ package com.lvmoney.provider.application;/** */ -import io.micrometer.core.instrument.MeterRegistry; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; -import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; /** * @describe： @@ -25,9 +21,5 @@ public class ProviderApplication { SpringApplication.run(ProviderApplication.class, args); } - @Bean - MeterRegistryCustomizer configurer(@Value("${spring.application.name}") String applicationName) { - return (registry) -> registry.config().commonTags("application", applicationName); - } } -- Gitee From 0f18740f5c82b6df66b4245f1ad69f72575a8124 Mon Sep 17 00:00:00 2001 From: lvmoney Date: Wed, 16 Oct 2019 18:02:09 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frame-repeatsubmit-support/pom.xml | 27 ++++++++++++ .../annotation/NoRepeatSubmit.java | 27 ++++++++++++ .../repeatsubmit/aop/NoRepeatSubmitAop.java | 44 +++++++++++++++++++ pom.xml | 1 + 4 files changed, 99 insertions(+) create mode 100644 frame-repeatsubmit-support/pom.xml create mode 100644 frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/annotation/NoRepeatSubmit.java create mode 100644 frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/aop/NoRepeatSubmitAop.java diff --git a/frame-repeatsubmit-support/pom.xml b/frame-repeatsubmit-support/pom.xml new file mode 100644 index 0000000..80473ae --- /dev/null +++ b/frame-repeatsubmit-support/pom.xml @@ -0,0 +1,27 @@ + + + + frame + com.lvmoney + 0.0.1-SNAPSHOT + + 4.0.0 + + frame-repeatsubmit-support + + + com.lvmoney + frame-common + 0.0.1-SNAPSHOT + + + + com.lvmoney + frame-redis-support + 0.0.1-SNAPSHOT + + + + \ No newline at end of file diff --git a/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/annotation/NoRepeatSubmit.java b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/annotation/NoRepeatSubmit.java new file mode 100644 index 0000000..8411411 --- /dev/null +++ b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/annotation/NoRepeatSubmit.java @@ -0,0 +1,27 @@ +package com.lvmoney.repeatsubmit.annotation;/** + * 描述: + * 包名:com.lvmoney.repeatsubmit.annotation + * 版本信息: 版本1.0 + * 日期:2019/10/16 + * Copyright XXXXXX科技有限公司 + */ + + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @describe：防止重复提交标记注解 + * @author: lvmoney/XXXXXX科技有限公司 + * @version:v1.0 2019/10/16 17:53 + */ +@Target(ElementType.METHOD) // 作用到方法上 +@Retention(RetentionPolicy.RUNTIME) // 运行时有效 +public @interface NoRepeatSubmit { + /** + * 被允许重复提交 + */ + boolean allow() default false; +} diff --git a/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/aop/NoRepeatSubmitAop.java b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/aop/NoRepeatSubmitAop.java new file mode 100644 index 0000000..cd6eda7 --- /dev/null +++ b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/aop/NoRepeatSubmitAop.java @@ -0,0 +1,44 @@ +package com.lvmoney.repeatsubmit.aop;/** + * 描述: + * 包名:com.lvmoney.repeatsubmit.aop + * 版本信息: 版本1.0 + * 日期:2019/10/16 + * Copyright XXXXXX科技有限公司 + */ + + +import com.lvmoney.repeatsubmit.annotation.NoRepeatSubmit; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +/** + * @describe： + * @author: lvmoney/XXXXXX科技有限公司 + * @version:v1.0 2019/10/16 17:58 + */ +public class NoRepeatSubmitAop { + @Around("execution(* com.example..*Controller.*(..)) && @annotation(nrs)") + public Object arround(ProceedingJoinPoint pjp, NoRepeatSubmit nrs) { + try { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + String sessionId = RequestContextHolder.getRequestAttributes().getSessionId(); + HttpServletRequest request = attributes.getRequest(); + String key = sessionId + "-" + request.getServletPath(); + if (opsForValue.get(key) == null) {// 如果缓存中有这个url视为重复提交 + Object o = pjp.proceed(); + opsForValue.set(key, 0, 2, TimeUnit.SECONDS); + return o; + } else { + logger.error("重复提交"); + return null; + } + } catch (Throwable e) { + e.printStackTrace(); + logger.error("验证重复提交时出现未知异常!"); + return "{\"code\":-889,\"message\":\"验证重复提交时出现未知异常!\"}"; + } + + } +} diff --git a/pom.xml b/pom.xml index f86da6d..8e1ab56 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ frame-bigdata-support frame-oauth2-support frame-ttc-support + frame-repeatsubmit-support