diff --git a/README.md b/README.md index e9bc9d2abb56dc3d6d224c9ad82b333855211636..d5b6f0716f9ca92e55bfd87e631ae4d7fe2e8156 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 等等 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 9dd092df4e281c16e02f6fcafb7b69dbda385831..479454535a5f9feda5824b22261d0a45a918f7f2 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 6c8944048a766aa2a2b55826a0bb0a411e5cc1fa..279e39d42da7a2ab39f7af7bb300a164abe59728 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 a432f40774e2ee5ed7db2c0f3138e57c238ddb05..e9f8d6bee8fb78df7d32bc742250f4fc426cf817 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 2d9556a41d8a77454e2af8148e0edd93694d197b..724056e739e422ff92a0df7f01f9bba8cf8f9d77 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 4e56c87b75cfe2d0333a52095f1488f7203d123b..ea3aacba0773f61f2c81111517afce8bb63d7f86 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 1c6a04f476be24ccc1b4676db8177d28feb7ee64..ab12870183dd33e418c88a453685ead8e9dac28e 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 fb6421b19a92c6c9b4facf62f65f1dc0763d0a74..a28fc1a20e2a2c5cf027f57ef59f4d81dab3c097 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 ff7675ef35cb0fe19b63a19b3761da8a24229cd3..12ff1099c2efe1c5c75ce53d6deb69a321707b5f 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 5cb86f4e98e18b59e8fd0b13d22e664f968fcbb3..26c30934e165950afe07df54d89a802dd2447127 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 c69cd80b3d0dde2d7b7f3929605ccdc9f5951704..a39cc5d4c6deba17210f4171af7d715ee2932817 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 6d1cc892b4bfeb579be732c552c37b3e1736f565..591862756986dc814126c85188dd28cb1880b2e2 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 08457eea8185e77164878f18c48b8a76879ee0ef..d4b555c74d9ce087358f3129715e5b720679e24d 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 d6ee5c43813875949f4ea45f30b2457c150f905b..fe7e16e728d244ab218af4fcfd7bc03ec2a704a7 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 412374ea4f4ad5a7c4bdcccd003494ac18471971..de408c947dd5d44966dceacbc57f64d70c2769f8 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 c82b20d85b6fa01d80effbd4118c66dc04273cfe..b51a87fbbf73221b39ee63c7788c0df11314e2e2 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 f2c6d884c6e65ca7f207b852c7c5e57e8e72e7d5..925c0851127f0601792e0d001a1257a48e20337b 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 b4f8867f99552d01df7fb1be13373f2a3a805bb1..9a34a9f78264c663a4d91b0c4fc738cfc4e598b9 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 20b54607ee9fecb9b825c54008560674210db9f9..69cb7644bb15da346daea149faf672e43d6d3f0f 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 11294bd4e75f5061142e75bb2942a10d11196567..f6c0374d1a236c48dad35c7406e949908bfc49d9 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 cd2a7d52e96798d1aa95e3942a6bdc2601da4de3..1477efaa8f8fbc53d7c29f68cba2e5bbdad4e497 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 539b4d54e930c2b1308834c0f666c441e3765304..4cbe1b1981e5e808e470f47adffcb83224f3218b 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 4f5b7e49697e8bca62acbfbde8e50a727e47208b..499c14fcf8b308efb20154e885905fb6470f7bdd 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 741ae0bac6a8fc0dcf33dcc218f74843cd35449a..fa68c79e719e0e27f234a28bcba39344aaba62b4 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 3f3ddbef667722c94251a80e8f20e2d88d04185e..b319211bb829d4ec6e2ab8a7e5542ac1edcce12c 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 90135cd22245fb5b750d6d0099535aa123cc9800..c83531969a858918bb3109af65817dedb5e333b4 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 49f3f28f195563c3259886115300d4c73a52924c..a9bd037b7994696f27eeb4604988ecb4a570f02f 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 1f004ee522063db45600696e181d794291054fa0..11b6459a5d282129bdac4102ee3770d1639447bb 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 16e3a2664fb2c65384e462fc1d7b47d7649dd78d..7fdbd919a2f17c56985349151d80a5f92c640a78 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/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 f6080ad141d21c6138a4ae57772d2d9750f5e0d2..2c31cbf6f0c661473566fb8ce330295711807c29 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 60916904620dc434363432b825036d7855fc1321..da408438d7fc09840883ebc3318d1a7a20f65a34 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/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 725d4c5ab3238ebaa62ad44954cc920584e45088..297a3ec9fad93500dbd6378ade63c4316ab6192b 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 aaa648a51c1427fb5cd79cacd578db1292e05afe..dc3c016d52919f795dfce379da8d514bc20bc93e 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 ab17dab677d558f77240a9286cd212f59a05be0d..6b78bebec19e627b04ecc0881b51753f8fafce88 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-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 99b1b5c8fbdf02fd3a797a9a279410983033d95c..8f4c86c0d1251355662d6867b0fb7c529f385826 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 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 02d7dc2dc0d1103eee517112c1b68aef4a3bee4b..b53c10c6becf6ecf05150094551f9c421124fb70 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 8d04c2108952eeb5943ea0314d571457abafac48..f84cfd846f0d724460b1f05316d9ac2ad6edb878 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 97% 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 f875c304db20cc8d6f7f6c754d20985858ab4aa0..43f48348845f516d2516c845ccd7db63da304c06 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：路由错误码定义接口 @@ -334,6 +334,16 @@ public interface CommonException { */ MODULE_ROOT_PATH_ERROR(PROXYERR + 115, "get module root path error"), + /** + * 重复提交支持与否 + */ + REPEATSUBMIT_SUPPORT_ERROR(PROXYERR + 116, "frame.repeactsubmit.support value is 'true' or 'false'"), + + /** + * 重复提交支持与否 + */ + REPEATSUBMIT_REQUEST_ERROR(PROXYERR + 117, "short time resubmission error"), + /** * 其他 */ 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 7cf90f4aba550e24a010f4d45501887f4a54dadb..e16db11f562f06ffd59743f2ba6b7f9a7fc58145 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 9cb6b772ce2cdff38a60e8dcfb0745a563dceb7f..74cfcb4016a78fde3f9e38a2118389367a62354d 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 42fe8cfb8423664ee56e660d006c5918978aaf58..7543e858dbb93e395be1aee6b258136788f21d7f 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 e3d69f3ed6d37395876aa7b521351c31088f8dce..7e6b97da86026736471f05e9621a43c862894678 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 648f4a2cd83be261852fae6ab9e0b8d1f5a73ca9..0080589a23860f047eb7a1655512c6888830a97a 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 618f481d129023e56a18c4e67959edb85132f52b..a24973402527c0f610f1a818ffc96e2895cfca1a 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 a34729996996135dcd05277a3d31d1a3f551a664..35e287a539b545e4ac33ef282080035223fd3127 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 ce26c717e324c421cd78622bf88ab91c4bdc1aed..a0a67a03405f3691f4e631600f3fab7cee5267d2 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 d0489b811235d82a786fa05942ced1b880e83f3d..13a5f5f73342841742c7ca8348a7f40654de5559 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 0279637267b120eeaed440a806391635ba03ba23..c09417f7235b7ecedc3f1eb8578a84dce62e938b 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 bee3fe1c558736d53b051c6e9a0e909edeab3cac..d7d0e2cc74b9c0941c2ed4a4992fdd8765ba3001 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 d749ce823312dbafe1928e8a1be14ab5f66b82ad..15e49255663f02c1151e6496cccdfe03e6a0da03 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 f2ffbdb6a1751b1a05f0eac67cb4ba246ecf6449..502a52e03c86a99b4a4b743f8b4870a9fadb067b 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 a6287353babec3983cf990b3f51b0b038248a40e..1da0c99c6c7d51eef0d72d3f82adc3f17d669eab 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 6de0a87e1e115c649669caa57771af1b1ecc9418..bc141197c383d2cd250bba284601f61af729c68f 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 77fa002de639eb11284e17ad6a79bd4552a4f014..1e77bb5d446dd61ea5cb2e6655068e1ed46a0fcc 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 96701111a66ba85096c10a6a90b993272101c2a2..9eacbdae6af01e96dec43741f28fe8747bb43e30 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 2f0271990614c2ffba2202461a3bc0f076632b51..aa17cdc3c4e3311f3cf53a15e6600d22d0263b0b 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 9f17f458c2756ff9b8b4dd8f8c935401fd9e4741..1d05de57eeca381bffb8ce5b4e5d10d556f09783 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 48556c6aa6b33a8bc2487227176b451d8d2d5aa0..dac8c65f61fb1861115c9f613e56ec050b2495ed 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 7b6e5da400110382c937483718c31ab956f5d6c6..863169c6bd7b911e1916b9d3154c7ae26232529a 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 923d14622aabcc31b05878da0d96cf8daadb2670..753b8e80489e9bb33e8fe88866fec01ed3407043 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 5f3ad856fae899278c4f31f4afdb68b324a7bc86..12928c6bd377d77966c8748382422f7ebfe95680 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 b3e0665366f5e6611efbcd5b57aca9e3c5655394..dbf15aeabb4444cfa351b2311d049316daffe5de 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 fa96ddaf6dac412bf81b9436d52edbd1e671ddbe..045c68e75b98bf772065332a9104cd88c4f2cd9b 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 647a4ce7ca1b2df52417e024ad993abf484859b5..74e6bda90cc7221ab137b18671ef50ec9241aa96 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 61eb38185fc1f98310e5d6b9ffd03c6eb41c91aa..ee3435368ee91d6dfc5a97c7944c4f5e6de37f69 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 3a9666b19940dbd68612880adb7bff8e9b835a4b..86da84f7ac7dfb2f8d39156772946da6701a2b77 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 2251cf68f2f9df718875ccbce589e4fce5d83a2a..7e418dce71f78f96e7939c3ae06c5ec82f232565 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 afb89914e7367cfee05cf94f19cf981550997b17..8fcc8db9e7bc0599ca04a15cefcec4ef51e89601 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 55a4366ff0538a4de59eab01b439a628f6fe65cf..9eb19cd8c507fe641d2e1c7e5bd8b6ca8b67b55c 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 6ef383cc83d33322ba5fd2ab2047698f7709132e..b3c785260bfe29beac6e12aaa832fe41a2e30258 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 6e102df926c036dcd35624273ac9848d25ffd985..ce1e46b4ed6eb423edb67bd2360b89ca338bf218 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 143a20d861dad78f1a3e86b3900b98773a0ffeee..590b72861e6e15e0a2704b82c957f7fdcd6bb17c 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 4c8c3606ac418f051aa39ad11ae11d90a2d42dc1..9c4e5bfa4be94f9433e5d2b1167935e0ff750cc1 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 770eab30aca2efec22f4d4914f081e31fca703c9..80b3750fbf3cb238f627da5d5fecd9feebb70b24 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 bbbb3771a29c8f19fc8e7344b765e1f55cf03348..079660e733a300b5c7c9d5667e797e61fb2dc4a5 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 fc9b092841107aba279064e00fe72fc44d842c02..60ed7a79f9c41b5ac8a600ce28635a6c4cdc55af 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 9913512455eef24e6cb4e8823846e14395030bb0..d3ded576dfc4135c34f1a537ac8cc1edf9677074 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 114b3f8645f7ca59d7ad72a8a2c7a97d9c01508b..3dd9ae5c8c8f8422e6adfe1bb01d44846a81ee73 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 ee8abec5c2a0e573deaabb0eb59bf21852539d4d..2daab73712f08ab4f88611404bba79ea58ead187 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 e3b252546c35e5bbfae6853a19803844aefc3259..eb3bb1a9270dbd6450bad3d20ea23970642639be 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 6667b4ff2703fd1297487af74c18ea3adb949cec..d302876acb06c3fb7f015f3c5a01ff5fa67d5bd9 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 9c82462963e791037031f0d20853d715b75a451b..43c269ada4bf208002c3f18b8a8d82f145785a95 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 ff637847a85ae0dd36fa45dc9bdc864ff8c95cf1..6cb8a62b24c77aafa2eeca6a330f324ae12e02a1 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 8804b37746e5b10020d6d8fe424f22a3b38f4ad3..61b42d12bb4fd64f0cdce08d1c35067f8c4d59e6 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 06d8da572046987cf293637197ab862569947047..a49f91c31cb8500dbd84f98bef33be7372753899 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 f174eab2a3e9a0864a064e6ee38377d6007a896e..7418971a030c754f204142f30c856214e527b502 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 8662d7b8cf5fb79a4d79ea4e233de98fca5f0abb..7e61af546df7bd3b67c2d3cd1ba4496a50b85efa 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 5cd9de7334bdea2d5e76513793699628b6e5b2be..50fc802283a2127f038600f6c308cfb0d7802eb3 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 3151c0bb0a276525895112915f765e7a9d724454..0b8096fd562c785c0b5cad856b60bce14c162461 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 557cd20ed864c93e6cc0fdc031d07f5c66e93347..7845043f7703c2346eda10fbcf3eb5011350f5c4 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 776df62f3faa138fe2a42e3cd9093c163cc5148d..7ea17d837d4fdc04c80afd1af76d8b58ba28aade 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 6fc96e13702c32aa740260c1ef1bd9e1bb5feac3..81ac6bbd77a518d18926b7944cc75f655bcc3b16 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 753fb1e54e60dd4ee80ad63f8c1cce0d119f55f6..673181332b06e272bd6b3203fb63c48c5bd71890 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 b9054341741619cecc62f006e7de37d365c9ff13..a020895ced8c6a207a8dc95756b04a03ae53cd4f 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 d4fb422be7b8a2ded661defafae9522ea403a352..b2397a3e06f6f7ab645fcbba0828b2662f36aaf1 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 63d7d176b95ea333a0979e2f3ec8814baa4c7c98..d26e9ccb9caa07fc715a616836f25a4a450673fc 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 f959a96cd51ffb1b0c1170063604c895149bdd8b..ce91825169e348c79dc76e9a8b1068d563d5c6f4 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/pom.xml b/frame-k8s-support/frame-base-support/pom.xml index bbffca626409c9150200bf62b942e1e84d2e3df4..c39a005624aa71cd601703c2f66d9e21661c8f90 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 0000000000000000000000000000000000000000..6c3bf58fe9a8dc0cf894ecd97a5079d02eac42fc --- /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-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 a24a6e6b53e21baa155048647110e59e8bac9ff7..87de67a985798f9fa59e76c6724186cbbcd49dc8 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/controller/DockerFileController.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/controller/DockerFileController.java index bfbb64d9bc868d8b1e07d76f27eecd1d8a940ed7..994b4f9cc06030a4c281933d53dfc4ebb6c6c435 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 c7e7ce9e228471e194053e67a4d7a2ceea4b7d06..6264abff35cf3570e33da0d8c11efc9493377f87 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/enums/ApiVersion.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/enums/ApiVersion.java index c79c59a1f7c74ef17a1165b9b99c7745b294ccfb..be072784fb69cf0c01aba4e7971d9a85756dfc4b 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/K8sServiceImpl.java b/frame-k8s-support/frame-base-support/src/main/java/com/lvmoney/k8s/base/service/impl/K8sServiceImpl.java index afa20f4bbffa028409d4d2b10ecdae7748c1b65e..4c3310867b6364418e0f5ab2d43a7a94c4b99ca8 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 e9bf3356ca12d6c0184edc26683d493dea771ef2..ffcf2fe066b0752d75b3615e797dc2422d4a7ff9 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; /** @@ -148,7 +145,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); @@ -157,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(); @@ -168,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-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 366918f34e20db766517ab0ca66c3d2b26fefdf8..2092de449e995544ca78a2c8f5934d911e348ac6 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 91% 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 d13d0fa6c47a6fabe4f2595765d83c6f2cd589c4..9e19f80390324ef222ecdabb6813309a0650e2f4 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; @@ -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-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 30ff4ce11f568c8cf0a434e8495171d001579e38..11006a2268cab022cc9dbe5d7f895c1b2b0211e8 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 1dd6279cf32d39bfb688941e2a4dd24c42477443..5b7e9c0655d5f040bd4cd132df7976b14f85f8de 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/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 0185ffa236f4d0576b366b742b3be5e829225011..5377e4ea689ec75fdf2f1d577cce4efa48c75243 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 0000000000000000000000000000000000000000..b55e3d7cd59c7a017ea7f5c409eaa87fb9c11f5e --- /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 0000000000000000000000000000000000000000..c35dd762f92329659aaa273c4302d178ba1261ad --- /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; +} 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 476a5d812dc0d54bb437f06d6314321956f0598c..5c28b7ab70942865155a54e03b5c65f6ceede7b7 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 ce52f55949ec9433a4fb9fc16562cbcf18cd7d6d..c596b55f30dc13d75a131ab4a83a5f60c18d70da 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/pom.xml b/frame-k8s-support/frame-customer-support/pom.xml index a179a563ea73e77c53237085fe7a45856c63c648..d2f8d1a1c23db5516d179c780dbfed842bb9bf89 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-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 6bcd176ac2850423053e8f75926d4bf8fb40f385..d55c67863a7a020842427d4e90e94a30480cbfc1 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 23585fe39bec65a0c1eabde8eb164ad4820f332a..fa071206d201383d5905d741098448efb5a21535 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 e73f2864bfbd471fbafd92d10206aae582303f42..936c98e517a7e2cfd63fb5e6430fc1af0967ccac 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 b0d3b68eba7c075efd08b5d728426580ac0904d1..c6aa4f481c3ddef3c2477313398aac6c91e52896 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 15f6e5d84ebb59b26520ce4a96dd9234eb6d0eb5..655156b82c1bc77ae028423e9e566ce29a470020 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 9ef052c6c2aca0d8c2edca515688189a26b68005..311a487c0adffb72f96be104bae54fc3bcb05fd2 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 961fae570a17c3e992c2385d4a6e89e9f8870ed9..80d695bc2c48538357464c7121401e4593e64b41 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 053f9d5c3f8e26f767c4cab397df9a43f0020e89..16a38277b359d784399d49c283ea1d77194651f9 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 b08ce4a490ff10756cce28c4c52146652138933b..bbbe75ab412a825b8b0812638657e358a79176d4 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 f1ea447d8368e95cd0273bba67d5dfe184318654..c5454db44e564b154318a90801b15480df4b6d93 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 9ec186d61393d6c8ead9384c3719102f7fdcf093..a7865d76bd103ebf04fdcfa815ff50faba37b3ee 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 c0c9fb9fd3ffeb9e259166391c47eefc2a48c87c..50e6c17759fa3ebdea74935cd3d7402c87749537 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/pom.xml b/frame-k8s-support/frame-provider-support/pom.xml index e938d586119fab91e47a8354801725734d225e6e..75ddd0a75169b4e42c1c9c9c23450249d10fa062 100644 --- a/frame-k8s-support/frame-provider-support/pom.xml +++ b/frame-k8s-support/frame-provider-support/pom.xml @@ -44,82 +44,77 @@ 0.0.1-SNAPSHOT - - org.springframework.cloud - spring-cloud-starter-config - 2.1.0.RELEASE - - - - 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 - - - ${docker.image.name} - ${docker.image.tag} - - - - package-push - package - - push - - - ${docker.image.tag} - - - - - ${docker.image.name} - java - - ${project.basedir}/src/main/resources - ${docker.host} - - - / - ${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 b4847b424cb49bb5d09c677ed04046bc36cd4d6e..779b0b33d40cead43d93c6a45261ef8f69c8c932 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 @@ -21,4 +21,5 @@ public class ProviderApplication { SpringApplication.run(ProviderApplication.class, args); } + } 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 d3a5686cbbc0fc5bee111f33ac8ba27f71ef80e2..caecad8960abce3d058f0795b617e437a3eb449e 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 3a8c0d323c49c155b8729aa9d51be35cc36d5309..0a0487eafa18837113cff07343e72b00a36c68a3 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-provider-support/src/main/resources/Dockerfile b/frame-k8s-support/frame-provider-support/src/main/resources/Dockerfile deleted file mode 100644 index 06c04d44a7b1b4af4c0d3c7a4de651e86aeee1c2..0000000000000000000000000000000000000000 --- 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 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 139597f9cb07c5d48bed18984ec4747f4b4f3438..0000000000000000000000000000000000000000 --- 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 9b7ee9c9f5492dea66e491b71c8a1ba18804e1b7..fa15eca79a386d5f0d25428e591556ba132160d2 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.1.171 istio: namespace: lvmoney docker: @@ -24,7 +17,7 @@ istio: yaml: cover: true replicas: 1 - version: v2 + version: v1 destination: support: true v1: 90 @@ -51,5 +44,14 @@ istio: ip: 192.168.1.181 operating: - environment: local - internal: internal \ No newline at end of file + environment: istio + internal: internal + +management: + endpoints: + web: + exposure: + include: "*" + metrics: + tags: + application: ${spring.application.name} \ No newline at end of file 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 a9cea001962df09a93279a98dbad8a1cdb5ca99d..79f6ccee5997fd053a47a28679b1f05beb15b770 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-k8s-support/readme.md b/frame-k8s-support/readme.md index 493bc3fd7eab262c52b50b0e2710bca103cc04b0..121e283c6187997a0870e2b6454e1114785f4cf4 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 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 0b33b2fd9d2d8231423781985ecf6d500068c950..322eadb277c72e65addb9ed9ee92849f60e142ad 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 294c417c3c630af7aaa260058dd7ae8f7b1cf27e..d9a06a3aaec8ba25dc759db40a26adf3c266ef36 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 7ca57d2ae4ef59a4f164b8c0db0d8da0894a37b2..9b766f23258a3c540f9e9e93fc1cd318d87cc318 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 57c62de195b01d5ae08705e23b597bd621af5049..64b6e2e825bfaaaa69954e64c44390bc7c48dc64 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 8c3bc51c567742b4cdbb4bea0d3e48ca1df5c637..8a39ffc0e4ca82603767d46b43f98a10c0be239d 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 6e903fc984dfe186a7ab3f551c470bb325514e16..5d93ea882cbc8813e0e41552b8aaf7cbea0725a0 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 ed26e2bd3c08a7ba95afd856c4724a4e015139dd..81ff94036848387047773ffb71f545427c422a6f 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 f0a0c4ce7b851adf3fdee20d231f9af934ed17a0..6de76ce92e65fbdde6d22c885f4fb4ab827407ad 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 91ee9c1b84460c31f98cc8ae48f726e608bf9292..26969c17c8c88538f7d09db6971c6897c0926b24 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 93993f51ba877074732c479c9f94573335c80395..74cf96fff20242996a91fda398d992f046dc65a6 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 0215ce8f07c1c4dc3ac6108dc4130e932dea80dd..5e579cee0a9f1f15b5296150f8eeefb6de0ff6ba 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 8aa8a8bcdc04d9e38c328c576d3eca76f619f95b..143b7083392f5b51fcfa4e59025e8d474f7f154c 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 36f9e56af99e7e2dbe82ac004a5c55d0d1be5b51..7a4e9874835fe23468a24dd95d73e5aeb1a922f2 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 6393eb2077095cfeaee26e127e315c995f82b61c..9c2ae7118efeb1916360f95316ec3b020a6d5011 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 cc07d5703d9a06007a33680fc2abb4e91bc123e8..930df880c23958307b098b787351d72ff6baa9b5 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 b51430c5fb5b038f0acffcbe8ae844bacd478839..20958817fbbbaa453d990c28bfec2cbb1dccbd51 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 9f7b48da28b4531ad40a9b4cfcb4b3514c7a8f00..857a3dd8e31afd0dae9c4a23a6aa37ccd2d46e7a 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 f2aa29074ee2c9a965debc8a8bc8c3d46c7d6f46..496d2fe81b27c86dcff5c761b5d334d3e162dae1 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 88ccb7001565f304c0a1212786ec562ac5a0d98b..d89c8e0ef658b96dd563208476c6bb6f3c16039f 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() { } @@ -162,15 +162,15 @@ public class LogAspect { private String getReturnParams(ProceedingJoinPoint joinPoint) { Object[] params = joinPoint.getArgs(); - String returnStr = ""; + StringBuilder returnStr = new StringBuilder(); for (Object param : params) { if (param instanceof String) { - returnStr += param; + returnStr.append(params); } else if (param instanceof Integer) { - returnStr += param; + returnStr.append(params); } } - return returnStr; + return returnStr.toString(); } /** 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 ce2e8835ecc4431416662c406018a604e72b18f2..ece834efc8f71be007a156fe4f9ac004c4854477 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 af91c9efd56eb9109be025dd6416c037c409d801..977efc91888eccfb6509ed8aabb2fc3743e24fff 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 7969240b489cbb08916d2e27949eadcaebbf9880..d3800701f1b70ef2bbbcdc2471b63492d3ea7eda 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 a8b187f19a2e58c2ff02ee63365060b1bbf5247f..147dcae171c0b29fa35951bca5028e35f836f402 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 8b1b97dec22820021fcdb6110bc8d9ab26df3ca1..b7ee14f3407e07e908f838052556556faad30f84 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 2ca1afb0840451e0d94e81ad4b65ef1ff59feb98..9229049a72b366897924c6b3f9c0b9f35312194c 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 553752911ef53681f3c60f09ef250fa935f8e630..a45df90378c9c0bc5fea8973a6d84e23e11ed0ff 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 0a40ac137b8a06f920da041e98ace4c96c484ea2..4819b27371cb6d116e8a5e5281643f1d13741f27 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 d3a230f778bf23566cf84bed6e7aeb228c8d6131..2d32db8a66532a3628c7494321ccd832f1a0d341 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 e18abb7651f0cf47f787b42ac9018b137e318f6d..acef610b3cd1d845d3d70c23b645c674a3482432 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 e49ccf033c96eadfb68578a0b8234ea94c4a13d4..1316d5b6ca41b39de3645335943acbfa1c15134d 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 064a201e6d2c26d22f701e13e610242ec5195404..fc4ca8038a211ed0f5811c439461c00849f39364 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 b6037a9e92fec9ac8ad46d01bf39d5b3d113c25b..466dc4240b7e4335e69e41d1d5b2cd21a67ead34 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 755bc922d3eedffccd71b2166b1153acadcbcc0d..e1b5dfc3d38435c546abfdcaeecccb2572ee4ede 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 a75f1b2feb25f5d7601851abc6d4e0cc6c7b0692..32da6f36dc5ac86e4d8319a2949f9eeae0c8eb98 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 d793d6f867b2b4959e4739aadfb08df3fddc8bf6..902ea7c7dbc501155e9218007d9a8fdb6c7cab78 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 20db3b50c87b4cbb814493d843c0dc42a2d4040b..fd8b68ebab197e98f31ff984167ea0c3bc4188f5 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 078cd84720c53189324cd85207302046a98b3d95..6d8ecd10a0a2f7661cb1af4f381ca01fb3d988db 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 8c962078e975f72ef36f2458cb244fd905ddb05e..7e9d19d5848c694b70a990976ad08e8c57dc62f9 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 ff6ca46f9a56ccfcf8099eaa0bfd711e6ac517ea..cf55d75ec502576e7fec5a11b6b150f336524ce6 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 cbe8e26a763a3a127f9e2d899a0e383f48651dc1..a86b65d18fddeb6bbef4c2d49fdb29d81d939aa3 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 8581dd35be1c57ff13ff3b5e4c9d3ad9c55583ba..3ab350ee9772d29fb1a881e0f876c293baf3b1fe 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 6e8a7c4e06373c37b8302d08c1dacc8c2e13e547..2b2ebbeb6d1d8278c74a374ff841fc3cbe9b3b41 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 822256202fd307145c5c71c585bf8874b307427d..b676b10f1f6a760464803d0c80a9b660787e7ce4 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 cde1241578dc3dd6744e094e27e8b5720ce986a6..adf13cd6cdd614d9622c5fadf9931011510da36e 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 a09b426e0027fc3ca2ea227c44c9148684f6d9f9..50a61e85c1444aaf871deaafb081436fcf394925 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 070c2db281e65bd2043cfac76c03994de977bf1f..8809b63d96360ae8cdd715badbaca981405ae363 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 3440db98f864b193ff6eda787215d7274e4e3987..ac2364fb855eaaf7407bc2b253cb1ee34123d6e6 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 9eacb3bf5897134f315565e2ee32ec4b4d52e91b..f4c7d3d00d313b533a1332fa5eaa4433254949f3 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 cfd36a8c43beb5c0e57490f7f5f5e3f350f17a59..fe5a70aeec843c6bd4a5c4d11d3c31b01bd64fba 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 20b0bedbdfd656d177c98397adb1281500251769..60aa45eb193923f670ad93d5e1db578850c43eeb 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 09d0507cafd4f1051381e0fd863c2098c9166530..38c30836a721c55e314db214b53479bb0c02f965 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 f388c0a820df507fee5bf0c357b36667243c5bae..8102f5b1df76f6a7337cda27dcdbea9ecc396086 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 06d852e5598022b8fc10635f057dd158d06f6ecc..7bb1c12a7d6fdcd73e28bd2e253c2fd3a5aa5a97 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 4b5269d3ee582ea9d629c62d81405e1929b66235..6eb7d97475aee3f7c329f8436d570dbbcdfd8a7f 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 6cda8bc1e4c4e4fd9a6e7a96d17df271c4695376..ffccd6eedb53be26d8c63a53c77a686641373fa1 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 b38fd99d4600189a480c9572a2004abe5f3867eb..97a5505bda5dab774fa1026a25e450099554753d 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 5f3e78e23e2ecfe3901e5f9b58da2052f44ae7b1..a3a168dae61902cd26ce7e0a98fd6de0844bff51 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 881ab0f0caba21b9e8986f07611dff54a14dacab..6539712dc59012b34e13b8fe88818b5aa285d1f5 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 16df3b0e282a8d22bf98df0c2a2aefee31e6cfb3..171fe323fb5b3b6b2eb8e4a339e4d2e6b4083032 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 df425490c3859d1fbff3dcff63023bc3b7c455e1..e536e6c168a18cb9d22fa7c029b3aafd9ef6bdcc 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 ad71167b0b6844aa116366e39da137eb8cb3d8e2..9db9c37ab10ea6595c8f1a6e8a748034a5dd602c 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 fe5d986334e6b12a94cf20980a4b394b51d42db2..665943c5d510dc781260983a584d1039d1d28db5 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 d5ce38d29ed5d2e9cf0db7bb57322b47041e67aa..35e8ae8dda4cd4a1a174ef1956351bf3bf0a70ec 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 dca1f82936ad581965fad90e85e3381f5476c434..e936d17c1a8c5586c65903b04d6b594a39d5435a 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 89685ba3c4fee0a5c8f028d8759da9829790aa71..70cb0ca1d72a93bfeeac138a8d97f890e5aef29a 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 4f3ad6d4718280c6d81402d21b7d66cc52b845ad..91250609e19c4757f8a01f27f07629087370c07b 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 0bb9d8c875f3430379d052f6042a5c84c3673118..f6c99c57665127818fc85bb384cd35c35c6f3a4d 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 337ee6c5e7b52b89530e0e885e4857bb9657bc56..cf45f4ccecb3fa7b7854d981d1ad58a359ba5985 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 6cb83da4dcb376033bbb3f678bb05b850ef51636..9c945d4599dbe8fab1d948254bdccdea5afac04d 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 f694eedf09ae5e43702dea04709534555dcc5014..f6188a97e82f5c9ae5b2e294288481559e8b3b76 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 b39a0abb581cedc561c0ba5716c9511200e0716a..e99e77378c6f1a1d6f8a97b442b968e114354192 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 e9f9d4e5069ff7eb267840c6e27bd90900dc575f..b0a61ba0882fb4d345652bd3dc61561d97aaa605 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 3279441c5b383712a0a6fb1eac04017de817903e..02e6c7d1b70de604e5cb9b2a827373b39fe964f6 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 610bd36f5e6b7a109726827cedfd188ce69468f5..b87c077bd2478cb26e0aab40b04b21e02318c823 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 0ee57194bba1135174fa9025772a7a83c64de78d..7e3f1730626e9efc5a460f77a7c8dcf677e61456 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 879f3dc9a6ee1b3d1d8004da2f735c03c026f4c1..d7131aac68f3fbd1880ec22f4a016eba4047a407 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 c2f16e338ea3bc7bd209d7d17577a811a4eb5db1..ce66b7cf26825ba48d5b628bfd974929f8a68719 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 0062c11afec002926ed20434dc0b7c795a4be4f6..50fc802283a2127f038600f6c308cfb0d7802eb3 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 60d4e748b755de11d4ab61fa02a0926de87f0356..fed947a3d7665ea8362cdf0d49b0894cd8ce9d7b 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 18f3b9ededb4ad7e25121db7ec2acdcd0debe1cb..9dbf66c24ce4d75608cea6b9635f34a735282e7f 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 0a0e4e2b2c417651412ee545bfd4b8aedb24534e..cd70121f4316d6222afe31c5d215b534801ea964 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 000ca007056c6f229863e879133d9e7ba2da3183..d25a2fd92d99db309447eef8113a69f67852daf7 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-repeatsubmit-support/pom.xml b/frame-repeatsubmit-support/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..f0a2b2e8f49a189562684a6987c1a26b1042a019 --- /dev/null +++ b/frame-repeatsubmit-support/pom.xml @@ -0,0 +1,34 @@ + + + + frame + com.lvmoney + 0.0.1-SNAPSHOT + + 4.0.0 + + frame-repeatsubmit-support + + + com.lvmoney + frame-common + 0.0.1-SNAPSHOT + + + + + + org.springframework.boot + spring-boot-starter-aop + + + + com.lvmoney + frame-lock-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 0000000000000000000000000000000000000000..1cb25c9bb54ca49d035cc3e7d9b785496d042375 --- /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 required() default false; +} diff --git a/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/application/RepeatsubmitApplication.java b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/application/RepeatsubmitApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..65421e32f0d9ba183b2770a1f8fff39b01c3c192 --- /dev/null +++ b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/application/RepeatsubmitApplication.java @@ -0,0 +1,25 @@ +package com.lvmoney.repeatsubmit.application;/** + * 描述: + * 包名:com.lvmoney.provider.application + * 版本信息: 版本1.0 + * 日期:2019/8/16 + * Copyright XXXXXX科技有限公司 + */ + + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @describe： + * @author: lvmoney/XXXXXX科技有限公司 + * @version:v1.0 2019/8/16 11:43 + */ +@SpringBootApplication(scanBasePackages = {"com.lvmoney.**"}) +public class RepeatsubmitApplication { + public static void main(String[] args) { + SpringApplication.run(RepeatsubmitApplication.class, args); + } + + +} diff --git a/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/aspect/NoRepeatSubmitAspect.java b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/aspect/NoRepeatSubmitAspect.java new file mode 100644 index 0000000000000000000000000000000000000000..634c1cd43403dba4022a88ddec68d34dabd4c809 --- /dev/null +++ b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/aspect/NoRepeatSubmitAspect.java @@ -0,0 +1,144 @@ +package com.lvmoney.repeatsubmit.aspect;/** + * 描述: + * 包名:com.lvmoney.repeatsubmit.aspect + * 版本信息: 版本1.0 + * 日期:2019/10/16 + * Copyright XXXXXX科技有限公司 + */ + + +import com.lvmoney.common.exception.BusinessException; +import com.lvmoney.common.exception.CommonException; +import com.lvmoney.common.util.vo.ResultData; +import com.lvmoney.lock.constant.LockConstant; +import com.lvmoney.lock.service.DistributedLockerService; +import com.lvmoney.repeatsubmit.annotation.NoRepeatSubmit; +import com.lvmoney.repeatsubmit.constant.RepeatsubmitConstant; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.lang3.StringUtils; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Pointcut; +import org.redisson.Redisson; +import org.redisson.api.RLock; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.aspectj.lang.annotation.Aspect; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.handler.AbstractHandlerMethodMapping; + +import javax.servlet.http.HttpServletRequest; +import java.lang.reflect.Method; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + +/** + * @describe： + * @author: lvmoney/XXXXXX科技有限公司 + * @version:v1.0 2019/10/16 17:58 + */ +@Aspect +@Component +public class NoRepeatSubmitAspect { + @Value("${frame.repeactsubmit.support:false}") + private String repeatSupport; + + @Autowired + AbstractHandlerMethodMapping abstractHandlerMethodMapping; + + /** + * 非token调用服务时应该记录的username，从request获得 + */ + @Value("${log.noToken.username:username}") + private String username; + @Value("${repeactsubmit.time:10}") + private int repeactsubmitTime; + + @Autowired + DistributedLockerService distributedLockerService; + + /*** + * 定义controller切入点拦截规则，拦截所有的controller方法 + */ + @Pointcut("@annotation(org.springframework.web.bind.annotation.RequestMapping)" + + "||@annotation(org.springframework.web.bind.annotation.PostMapping)" + + "||@annotation(org.springframework.web.bind.annotation.GetMapping)" + + "||@annotation(org.springframework.web.bind.annotation.PatchMapping)" + + "||@annotation(org.springframework.web.bind.annotation.PutMapping)" + + "||@annotation(org.springframework.web.bind.annotation.DeleteMapping)") + public void controllerAspect() { + } + + /** + * 限制重复提交，判断同一个ip的用户在短时间内请求同一个地址的频率 + * 1、理论上讲应该通过请求数据进行判断，但是基于经验一般重复提交都是用户重复发起同一个请求（一般是insert）导致数据的错误 + * 2、通过时间来限制，可以防止某个单点频繁的请求服务器导致服务器压力 + * + * @param joinPoint + * @return + * @throws Throwable + */ + @Around("controllerAspect()") + public ResultData recordLog(ProceedingJoinPoint joinPoint) throws Throwable { + Object proceed; + + if (RepeatsubmitConstant.FRAME_REPEAT_SUPPORT_FALSE.equals(repeatSupport)) { + proceed = joinPoint.proceed(); + return (ResultData) proceed; + } else if (!RepeatsubmitConstant.FRAME_REPEAT_SUPPORT_FALSE.equals(repeatSupport) && !RepeatsubmitConstant.FRAME_REPEAT_SUPPORT_TRUE.equals(repeatSupport)) { + throw new BusinessException(CommonException.Proxy.REPEATSUBMIT_SUPPORT_ERROR); + } + + //获取session中的用户 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + Object object = abstractHandlerMethodMapping.getHandler(request).getHandler(); + HandlerMethod handlerMethod = (HandlerMethod) object; + Method method = handlerMethod.getMethod(); + // 检查是否有NotToken注释，有则跳过认证 + if (method.isAnnotationPresent(NoRepeatSubmit.class)) { + NoRepeatSubmit noRepeatSubmit = method.getAnnotation(NoRepeatSubmit.class); + if (!noRepeatSubmit.required()) { + proceed = joinPoint.proceed(); + //提取controller中ExecutionResult的属性 + return (ResultData) proceed; + } + } + // 从 http 请求头中取出 + String token = request.getHeader("token"); + String name = ""; + if (StringUtils.isBlank(token)) { + try { + String reqName = request.getParameter(username).toString(); + if (StringUtils.isBlank(reqName)) { + name = "user not logged"; + } else { + name = reqName; + } + } catch (Exception e) { + //1、正常情况下，本系统间调用应该通过token，或者username来记录请求人信息 + //2、当三方系统调用平台时可能不会加token或者username，为了不抛错，所以要给它默认值 +// LOGGER.error("获取用户信息请求参数{}报错:{}", username, e.getMessage()); +// throw new BusinessException(CommonException.Proxy.USERNMAE_IS_REQUIRED); + name = "NotLogged"; + } + + } else { + name = token; + } + String ip = request.getRemoteAddr(); + String lockKey = name + RepeatsubmitConstant.CONNECTOR_UNDERLINE + request.getServletPath() + RepeatsubmitConstant.CONNECTOR_UNDERLINE + ip; + boolean lock = distributedLockerService.tryLock(lockKey, TimeUnit.SECONDS, 1, repeactsubmitTime); + if (lock) { + proceed = joinPoint.proceed(); + return (ResultData) proceed; + } else { + throw new BusinessException(CommonException.Proxy.REPEATSUBMIT_REQUEST_ERROR); + } + + } + + +} diff --git a/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/constant/RepeatsubmitConstant.java b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/constant/RepeatsubmitConstant.java new file mode 100644 index 0000000000000000000000000000000000000000..826e7d83689f792ce5ca9a2676626e58200aabef --- /dev/null +++ b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/constant/RepeatsubmitConstant.java @@ -0,0 +1,19 @@ +package com.lvmoney.repeatsubmit.constant; + +public class RepeatsubmitConstant { + + /** + * 是否引入重复提交的配置文件值 + */ + public static final String FRAME_REPEAT_SUPPORT_FALSE = "false"; + /** + * 是否引入重复提交的配置文件值 + */ + public static final String FRAME_REPEAT_SUPPORT_TRUE = "true"; + + /** + * 连接符下划线 + */ + public static final String CONNECTOR_UNDERLINE = "_"; + +} diff --git a/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/controller/TestController.java b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/controller/TestController.java new file mode 100644 index 0000000000000000000000000000000000000000..715a2fb67bdfcb6377473506d06e0907859864da --- /dev/null +++ b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/controller/TestController.java @@ -0,0 +1,16 @@ +package com.lvmoney.repeatsubmit.controller; + +import com.lvmoney.common.util.ResultUtil; +import com.lvmoney.common.util.vo.ResultData; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class TestController { + + @GetMapping(value = "test") + public ResultData index(String username) { + return ResultUtil.success("this is provider server99"); + } +} diff --git a/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/vo/UserVo.java b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/vo/UserVo.java new file mode 100644 index 0000000000000000000000000000000000000000..c02469d12e6b172ceff33a287606e320794a9b2a --- /dev/null +++ b/frame-repeatsubmit-support/src/main/java/com/lvmoney/repeatsubmit/vo/UserVo.java @@ -0,0 +1,24 @@ +package com.lvmoney.repeatsubmit.vo;/** + * 描述: + * 包名:com.lvmoney.jwt.annotation + * 版本信息: 版本1.0 + * 日期:2019/2/1 + * Copyright xxxx科技有限公司 + */ + + +import lombok.Data; + +import java.io.Serializable; + +/** + * @describe： + * @author: lvmoney /xxxx科技有限公司 + * @version:v1.0 2018年10月30日 下午3:29:38 + */ +@Data +public class UserVo implements Serializable { + private String token; + private String username; + private String userId; +} diff --git a/frame-repeatsubmit-support/src/main/resources/application.yml b/frame-repeatsubmit-support/src/main/resources/application.yml new file mode 100644 index 0000000000000000000000000000000000000000..55e54c8f2b1bf7d17b31e47f90746a6ce6b931da --- /dev/null +++ b/frame-repeatsubmit-support/src/main/resources/application.yml @@ -0,0 +1,16 @@ +frame: + repeactsubmit: + support: true +spring: + http: + encoding: + force: true + charset: utf-8 + enabled: true + redis: + database: 0 + port: 6379 + host: localhost +redisson: + address: redis://localhost:6379 + password: \ No newline at end of file diff --git a/frame-repeatsubmit-support/src/main/resources/readme.md b/frame-repeatsubmit-support/src/main/resources/readme.md new file mode 100644 index 0000000000000000000000000000000000000000..7c8fee5b7ec8d5b31c8992533c29a57cad65f449 --- /dev/null +++ b/frame-repeatsubmit-support/src/main/resources/readme.md @@ -0,0 +1,6 @@ +1、对同一个人通过同一个ip发起的同一个请求加上分布式锁，以限制重复提交 +2、frame.repeactsubmit.support=true 表示支持防止重复提交 +3、repeactsubmit.time=10 表示限制重复请求的时间默认为10s +4、系统通过aop，默认会对所有的控制器进行重复校验，如果想某个控制器不需要重复判断校验， +在控制器上加上注解@NoRepeatSubmit required=true 表示支持，required=false表示该控制器不需要重复校验 + 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 7874e4843a63782c0cec8aca18aba8617e70f909..94e513d75d65d5f98cf38af619d1d200e7614044 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 15d03f414e9b0d6b3e4d5ea0d5f1ab7d135f1910..91afd5e0b31225ecde5266e31e3851f542738a94 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 af81dd37ab12af0e3b80c3453233c650fb0f342d..5cd57ec9ddd14a60a820f0d793c62fda50b21fca 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 c94422c1c935627dd69bc052849b73f1b1172e5c..16da88dc029da447973ccfbc3ed02917b5d442f5 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 c531c32a9fc451afc6ec2c1153d8a27e8f244462..27331f08016ffe75348e838be6c12b67d702b4fc 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 0af2aef8396e76211693b014932133a2abab4edd..555dadb5f2db1446d9d3e59a0f4771df71141d5b 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 7b311f069c1ecf3a358886a19b96506aae4d3e01..5324e1d2cd819ec14aa51a81af1189c6536a1218 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 1aa7c51c4e379fe4ed65cae6e6b82d63344528e1..4d3b616dcf9f42e6471330867911af17defb587a 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 0fc830004ad346ef0de5ffdc7a885178d893472d..6044df91cb811121a187eaf3b9140f14e2509b91 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 466874940baf771628183e7f62a12dfe2709b95b..0cf6c063926af49f3a1fbe1e92a67ae0f6c53c80 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 d88ad380084e70245fdda6e6e4bba1d5f36ee877..39cc4b3335806c33bcc1ec37e01c6bb2aaf620c5 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 d022f2dcaaee36ad8144f4f764a018ac0d40782f..7d069378ae5947139a764453a18e870b37046d0c 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 ee5875f879ca8fb4f6d6b1311a4d0a1c70a498a7..a1af3c9c0d9d200260aff664825bab8ba25f61fd 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 654e54bc36f69fec133ebae3e9f564f65fc24d1f..86b4143de049ec4e814501ebd1eac6d64cdc1c2b 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 7de3c7cd23b7c4f06e66a6c5a878763e43db126d..7f638550b326079c0288006eca79436b2ff07e9f 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 6c10907a43385c1695b138f86e1ba7ca47ca82df..86ae200b1bfdd7c4c678044b07cef4c3b338cef3 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 e441586c4b64a87ef38ba0068684cdbd27539fbe..7f70ca7246031da5666ba5a5eb8e6897f79c848d 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 bf0e7d443bc9e1803af764b1f21bb754c1bdb075..9bce698b82fbdf40249f37aa15af82c4dd056430 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 93517bf8408c2df7725c5077cecb812fe615db9d..0445fa490e9a64fbe36d5b8c224da898105d7f16 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 13860dadd19b34ed7b46486ce1986ae73e1f6b02..6e56f427689e78698265ed222b7ab045a1bbe5e8 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 dd436acfaa20d49fef0618c76c6116c4b091bab8..d63c8c12e6c2c33b9c632e418f102b2cdec155d7 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 a6400a0d7669bb3eeeadb223cde7b652ab11343e..af2aa595d7c330965d7ebada7343b818ccabbf14 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 168f8b0020c8511874e1de86a0a147f136ce06d1..45ca687e4336f0928e5730c1c90a4f3a6bc2ee12 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 3dd9f59631d77b79390dc13ddb58819896ee5804..6299f935be8bb622ba20729538396d1108f90776 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 22e9803c268f71ef9a8ebfd899962e4bec0d86e1..d7a600d6d38ba53ee36ac01ff4d3cf3a57045444 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科技有限公司 diff --git a/pom.xml b/pom.xml index f86da6d726cea5c186c5aeaa9e304eb13f19dc46..8e1ab56a60f48ee3b7b3c2c12c3bdbd7ced3fc8f 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ frame-bigdata-support frame-oauth2-support frame-ttc-support + frame-repeatsubmit-support