diff --git a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/UpmsAutoConfiguration.java b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/UpmsAutoConfiguration.java similarity index 83% rename from ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/UpmsAutoConfiguration.java rename to ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/UpmsAutoConfiguration.java index 43bb872..26f8a71 100644 --- a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/UpmsAutoConfiguration.java +++ b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/UpmsAutoConfiguration.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.admin.upms; +package com.baiye.upms; //import com.hccake.ballcat.admin.upms.log.LogConfiguration; -import com.hccake.ballcat.system.authentication.BallcatOAuth2TokenResponseEnhancer; -import com.hccake.ballcat.system.authentication.DefaultUserInfoCoordinatorImpl; -import com.hccake.ballcat.system.authentication.SysUserDetailsServiceImpl; -import com.hccake.ballcat.system.authentication.UserInfoCoordinator; -import com.hccake.ballcat.system.properties.SystemProperties; -import com.hccake.ballcat.system.service.SysUserService; +import com.baiye.system.authentication.BallcatOAuth2TokenResponseEnhancer; +import com.baiye.system.authentication.DefaultUserInfoCoordinatorImpl; +import com.baiye.system.authentication.SysUserDetailsServiceImpl; +import com.baiye.system.authentication.UserInfoCoordinator; +import com.baiye.system.properties.SystemProperties; +import com.baiye.system.service.SysUserService; import org.ballcat.security.properties.SecurityProperties; import org.ballcat.springsecurity.oauth2.server.authorization.web.authentication.OAuth2TokenResponseEnhancer; import org.ballcat.springsecurity.oauth2.server.resource.introspection.SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector; @@ -19,7 +19,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.oauth2.server.authorization.OAuth2Authorization; @@ -31,13 +30,12 @@ import org.springframework.security.oauth2.server.resource.introspection.OpaqueT */ @EnableAsync @AutoConfiguration -@MapperScan("com.hccake.ballcat.**.mapper") +@MapperScan("com.baiye.**.mapper") // @ComponentScan({ "com.hccake.ballcat.admin.upms", "com.hccake.ballcat.system", // "com.hccake.ballcat.log", // "com.hccake.ballcat.file", "com.hccake.ballcat.notify" }) -@ComponentScan({ "com.hccake.ballcat.admin.upms", "com.hccake.ballcat.system", "com.hccake.ballcat.file" }) +@ComponentScan({ "com.baiye.upms", "com.hccake.ballcat.system" }) @EnableConfigurationProperties({ SystemProperties.class, SecurityProperties.class }) -// @Import(LogConfiguration.class) public class UpmsAutoConfiguration { /** diff --git a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/FillMetaObjectHandle.java b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/FillMetaObjectHandle.java similarity index 81% rename from ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/FillMetaObjectHandle.java rename to ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/FillMetaObjectHandle.java index 56fbb3a..b8549e9 100644 --- a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/FillMetaObjectHandle.java +++ b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/FillMetaObjectHandle.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.admin.upms.config.mybatis; +package com.baiye.upms.config.mybatis; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.hccake.ballcat.common.core.constant.GlobalConstants; -import com.hccake.ballcat.common.security.userdetails.User; -import com.hccake.ballcat.common.security.util.SecurityUtils; +import com.baiye.constant.GlobalConstants; +import com.baiye.security.userdetails.User; +import com.baiye.security.util.SecurityUtils; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; diff --git a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/MybatisPlusConfig.java b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/MybatisPlusConfig.java similarity index 90% rename from ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/MybatisPlusConfig.java rename to ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/MybatisPlusConfig.java index c738e00..e982996 100644 --- a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/mybatis/MybatisPlusConfig.java +++ b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/mybatis/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.upms.config.mybatis; +package com.baiye.upms.config.mybatis; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.FieldFill; @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.injector.ISqlInjector; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.hccake.extend.mybatis.plus.injector.CustomSqlInjector; -import com.hccake.extend.mybatis.plus.methods.InsertBatchSomeColumnByCollection; +import com.baiye.extend.mybatis.plus.injector.CustomSqlInjector; +import com.baiye.extend.mybatis.plus.methods.InsertBatchSomeColumnByCollection; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/MdcTaskDecorator.java b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/task/MdcTaskDecorator.java similarity index 93% rename from ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/MdcTaskDecorator.java rename to ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/task/MdcTaskDecorator.java index 827ac9e..d32fa76 100644 --- a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/MdcTaskDecorator.java +++ b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/task/MdcTaskDecorator.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.upms.config.task; +package com.baiye.upms.config.task; import cn.hutool.core.map.MapUtil; import org.slf4j.MDC; diff --git a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/TaskExecutionConfiguration.java b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/task/TaskExecutionConfiguration.java similarity index 96% rename from ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/TaskExecutionConfiguration.java rename to ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/task/TaskExecutionConfiguration.java index 9126a58..fa3c9c6 100644 --- a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/config/task/TaskExecutionConfiguration.java +++ b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/config/task/TaskExecutionConfiguration.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.upms.config.task; +package com.baiye.upms.config.task; import org.springframework.boot.task.TaskExecutorCustomizer; import org.springframework.context.annotation.Bean; diff --git a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LogConfiguration.java b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/log/LogConfiguration.java similarity index 100% rename from ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LogConfiguration.java rename to ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/log/LogConfiguration.java diff --git a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LoginLogHandler.java b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/log/LoginLogHandler.java similarity index 60% rename from ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LoginLogHandler.java rename to ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/log/LoginLogHandler.java index 6f089e9..646b19c 100644 --- a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/LoginLogHandler.java +++ b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/log/LoginLogHandler.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.upms.log; +package com.baiye.upms.log; /** * @author hccake diff --git a/ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/SpringAuthorizationServerLoginLogHandler.java b/ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/log/SpringAuthorizationServerLoginLogHandler.java similarity index 100% rename from ad-distribute-admin/admin-core/src/main/java/com/hccake/ballcat/admin/upms/log/SpringAuthorizationServerLoginLogHandler.java rename to ad-distribute-admin/admin-core/src/main/java/com/baiye/upms/log/SpringAuthorizationServerLoginLogHandler.java diff --git a/ad-distribute-admin/admin-core/src/main/resources/META-INF/spring.factories b/ad-distribute-admin/admin-core/src/main/resources/META-INF/spring.factories index 9b59bf2..44aa29b 100644 --- a/ad-distribute-admin/admin-core/src/main/resources/META-INF/spring.factories +++ b/ad-distribute-admin/admin-core/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.admin.upms.UpmsAutoConfiguration \ No newline at end of file + com.baiye.upms.UpmsAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-admin/admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ad-distribute-admin/admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 1f721c6..8b53834 100644 --- a/ad-distribute-admin/admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ad-distribute-admin/admin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.admin.upms.UpmsAutoConfiguration \ No newline at end of file +com.baiye.upms.UpmsAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/AdminWebSocketAutoConfiguration.java b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/AdminWebSocketAutoConfiguration.java similarity index 76% rename from ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/AdminWebSocketAutoConfiguration.java rename to ad-distribute-admin/admin-websocket/src/main/java/com/baiye/AdminWebSocketAutoConfiguration.java index 48aa576..97f69b2 100644 --- a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/AdminWebSocketAutoConfiguration.java +++ b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/AdminWebSocketAutoConfiguration.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.websocket; +package com.baiye; -import com.hccake.ballcat.admin.websocket.component.UserAttributeHandshakeInterceptor; -import com.hccake.ballcat.admin.websocket.component.UserSessionKeyGenerator; -import com.hccake.ballcat.common.websocket.session.SessionKeyGenerator; +import com.baiye.component.UserAttributeHandshakeInterceptor; +import com.baiye.component.UserSessionKeyGenerator; +import com.baiye.session.SessionKeyGenerator; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; diff --git a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/SystemWebsocketEventListenerConfiguration.java b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/SystemWebsocketEventListenerConfiguration.java similarity index 76% rename from ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/SystemWebsocketEventListenerConfiguration.java rename to ad-distribute-admin/admin-websocket/src/main/java/com/baiye/SystemWebsocketEventListenerConfiguration.java index 83411ef..9675c05 100644 --- a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/SystemWebsocketEventListenerConfiguration.java +++ b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/SystemWebsocketEventListenerConfiguration.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.websocket; +package com.baiye; -import com.hccake.ballcat.admin.websocket.listener.SystemWebsocketEventListener; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; +import com.baiye.listener.SystemWebsocketEventListener; +import com.baiye.distribute.MessageDistributor; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; diff --git a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserAttributeHandshakeInterceptor.java b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/component/UserAttributeHandshakeInterceptor.java similarity index 90% rename from ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserAttributeHandshakeInterceptor.java rename to ad-distribute-admin/admin-websocket/src/main/java/com/baiye/component/UserAttributeHandshakeInterceptor.java index 25aebf4..902e30b 100644 --- a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserAttributeHandshakeInterceptor.java +++ b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/component/UserAttributeHandshakeInterceptor.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.websocket.component; +package com.baiye.component; -import com.hccake.ballcat.admin.websocket.constant.AdminWebSocketConstants; -import com.hccake.ballcat.common.security.userdetails.User; -import com.hccake.ballcat.common.security.util.SecurityUtils; +import com.baiye.constant.AdminWebSocketConstants; +import com.baiye.security.userdetails.User; +import com.baiye.security.util.SecurityUtils; import lombok.RequiredArgsConstructor; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; diff --git a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserSessionKeyGenerator.java b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/component/UserSessionKeyGenerator.java similarity index 81% rename from ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserSessionKeyGenerator.java rename to ad-distribute-admin/admin-websocket/src/main/java/com/baiye/component/UserSessionKeyGenerator.java index 5aeab1f..d8760f0 100644 --- a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/component/UserSessionKeyGenerator.java +++ b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/component/UserSessionKeyGenerator.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.websocket.component; +package com.baiye.component; -import com.hccake.ballcat.admin.websocket.constant.AdminWebSocketConstants; -import com.hccake.ballcat.common.websocket.session.SessionKeyGenerator; +import com.baiye.constant.AdminWebSocketConstants; +import com.baiye.session.SessionKeyGenerator; import lombok.RequiredArgsConstructor; import org.springframework.web.socket.WebSocketSession; diff --git a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/constant/AdminWebSocketConstants.java b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/constant/AdminWebSocketConstants.java similarity index 88% rename from ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/constant/AdminWebSocketConstants.java rename to ad-distribute-admin/admin-websocket/src/main/java/com/baiye/constant/AdminWebSocketConstants.java index 680b2a2..183b2d1 100644 --- a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/constant/AdminWebSocketConstants.java +++ b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/constant/AdminWebSocketConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.websocket.constant; +package com.baiye.constant; /** * @author Hccake 2021/1/5 diff --git a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/NotifyWebsocketEventListener.java b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/listener/NotifyWebsocketEventListener.java similarity index 100% rename from ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/NotifyWebsocketEventListener.java rename to ad-distribute-admin/admin-websocket/src/main/java/com/baiye/listener/NotifyWebsocketEventListener.java diff --git a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/SystemWebsocketEventListener.java b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/listener/SystemWebsocketEventListener.java similarity index 69% rename from ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/SystemWebsocketEventListener.java rename to ad-distribute-admin/admin-websocket/src/main/java/com/baiye/listener/SystemWebsocketEventListener.java index ac7b4ea..3bd2718 100644 --- a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/listener/SystemWebsocketEventListener.java +++ b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/listener/SystemWebsocketEventListener.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.admin.websocket.listener; +package com.baiye.listener; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.ballcat.common.websocket.distribute.MessageDO; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -import com.hccake.ballcat.system.event.DictChangeEvent; -import com.hccake.ballcat.admin.websocket.message.DictChangeMessage; +import com.baiye.util.JsonUtils; +import com.baiye.distribute.MessageDO; +import com.baiye.distribute.MessageDistributor; +import com.baiye.system.event.DictChangeEvent; +import com.baiye.message.DictChangeMessage; import lombok.RequiredArgsConstructor; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; diff --git a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/AnnouncementCloseMessage.java b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/message/AnnouncementCloseMessage.java similarity index 70% rename from ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/AnnouncementCloseMessage.java rename to ad-distribute-admin/admin-websocket/src/main/java/com/baiye/message/AnnouncementCloseMessage.java index aa5b1b7..3381100 100644 --- a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/AnnouncementCloseMessage.java +++ b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/message/AnnouncementCloseMessage.java @@ -1,6 +1,5 @@ -package com.hccake.ballcat.admin.websocket.message; +package com.baiye.message; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; import lombok.Getter; import lombok.Setter; diff --git a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/DictChangeMessage.java b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/message/DictChangeMessage.java similarity index 72% rename from ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/DictChangeMessage.java rename to ad-distribute-admin/admin-websocket/src/main/java/com/baiye/message/DictChangeMessage.java index 41b7a74..3f4ba64 100644 --- a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/message/DictChangeMessage.java +++ b/ad-distribute-admin/admin-websocket/src/main/java/com/baiye/message/DictChangeMessage.java @@ -1,6 +1,5 @@ -package com.hccake.ballcat.admin.websocket.message; +package com.baiye.message; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; import lombok.Getter; import lombok.Setter; diff --git a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/NotifyWebsocketEventListenerConfiguration.java b/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/NotifyWebsocketEventListenerConfiguration.java deleted file mode 100644 index 611e6f5..0000000 --- a/ad-distribute-admin/admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/NotifyWebsocketEventListenerConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ -// package com.hccake.ballcat.admin.websocket; -// -// import com.hccake.ballcat.admin.websocket.listener.NotifyWebsocketEventListener; -// import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -// import com.hccake.ballcat.notify.handler.NotifyInfoDelegateHandler; -// import com.hccake.ballcat.notify.model.domain.NotifyInfo; -// import com.hccake.ballcat.notify.service.UserAnnouncementService; -// import lombok.RequiredArgsConstructor; -// import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -// import org.springframework.context.annotation.Bean; -// import org.springframework.context.annotation.Configuration; -// -// @RequiredArgsConstructor -// @ConditionalOnClass({ NotifyWebsocketEventListener.class, UserAnnouncementService.class -// }) -// @Configuration(proxyBeanMethods = false) -// public class NotifyWebsocketEventListenerConfiguration { -// -// private final MessageDistributor messageDistributor; -// -// @Bean -// public NotifyWebsocketEventListener notifyWebsocketEventListener( -// NotifyInfoDelegateHandler notifyInfoDelegateHandler) { -// return new NotifyWebsocketEventListener(messageDistributor, notifyInfoDelegateHandler); -// } -// -// } diff --git a/ad-distribute-admin/admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ad-distribute-admin/admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5a8d836..385abad 100644 --- a/ad-distribute-admin/admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ad-distribute-admin/admin-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.admin.websocket.AdminWebSocketAutoConfiguration \ No newline at end of file +com.baiye.AdminWebSocketAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-common/common-core/pom.xml b/ad-distribute-common/common-core/pom.xml index 5a6cf5b..0d9f255 100644 --- a/ad-distribute-common/common-core/pom.xml +++ b/ad-distribute-common/common-core/pom.xml @@ -8,7 +8,6 @@ 4.0.0 common-core - jar diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/compose/ContextComponent.java b/ad-distribute-common/common-core/src/main/java/com/baiye/compose/ContextComponent.java similarity index 92% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/compose/ContextComponent.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/compose/ContextComponent.java index 4752c6b..ba16307 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/compose/ContextComponent.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/compose/ContextComponent.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.compose; +package com.baiye.compose; /** * 上下文组件, 在接入对应的上下文时(如: spring 的 bean) 便于在 开始和结束时执行对应的方法 diff --git a/ad-distribute-common/common-core/src/main/java/com/baiye/constant/DefaultNumberConstants.java b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/DefaultNumberConstants.java new file mode 100644 index 0000000..b0646f4 --- /dev/null +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/DefaultNumberConstants.java @@ -0,0 +1,239 @@ +package com.baiye.constant; + +/** + * 数值常量定义 + * + * @author Enzo + * @date : 2021/6/17 + */ +public class DefaultNumberConstants { + + private DefaultNumberConstants() { + + } + + /** + * -3 + */ + public static final int MINUS_THREE_NUMBER = -3; + + /** + * -2 + */ + public static final int MINUS_TWO_NUMBER = -2; + + /** + * -1 + */ + public static final int MINUS_ONE_NUMBER = -1; + + /** + * 0 + */ + public static final int ZERO_NUMBER = 0; + + /** + * 1 + */ + public static final int ONE_NUMBER = 1; + + /** + * 2 + */ + public static final int TWO_NUMBER = 2; + + /** + * 3 + */ + public static final int THREE_NUMBER = 3; + + /** + * 4 + */ + public static final int FOUR_NUMBER = 4; + + /** + * 5 + */ + public static final int FIVE_NUMBER = 5; + + /** + * 6 + */ + public static final int SIX_NUMBER = 6; + + /** + * 7 + */ + public static final int SEVEN_NUMBER = 7; + + /** + * 8 + */ + public static final int EIGHT_NUMBER = 8; + + /** + * 9 + */ + public static final int NINE_NUMBER = 9; + + /** + * 10 + */ + public static final int TEN_NUMBER = 10; + + /** + * 11 + */ + public static final int ELEVEN_NUMBER = 11; + + /** + * 21 + */ + public static final int TWELVE_NUMBER = 12; + + /** + * 14 + */ + public static final int FOURTEEN_NUMBER = 14; + + /** + * 15 + */ + public static final int FIFTEEN_NUMBER = 15; + + /** + * 16 + */ + public static final int SIXTEEN_NUMBER = 16; + + /** + * 20 + */ + public static final int TWENTY_NUMBER = 20; + + public static final int TWENTY_ONE = 21; + + /** + * 23 + */ + public static final int TWENTY_THREE = 23; + + /** + * 24 + */ + public static final int TWENTY_FOUR = 24; + + /** + * 30 + */ + public static final int THIRTY = 30; + + public static final int FORTY_EIGHT = 48; + + /** + * 60 + */ + public static final int FIFTY = 50; + + /** + * 60 + */ + public static final int SIXTY = 60; + + /** + * 90 + */ + public static final int NINETY = 90; + + /** + * 98 + */ + public static final int NINETY_EIGHT = 98; + + /** + * 99 + */ + public static final int NINETY_NINE = 99; + + /** + * 100 + */ + public static final int ONE_HUNDRED = 100; + + /** + * 200 + */ + public static final int TWO_HUNDRED = 200; + + /** + * 500 + */ + public static final int FIVE_HUNDRED = 500; + + /** + * 201 + */ + public static final int TWO_HUNDRED_ONE = 201; + + /** + * 1005 + */ + public static final int ONE_THOUSAND_AND_FIVE = 1005; + + /** + * 1000 + */ + public static final int ONE_THOUSAND = 1000; + + /** + * 5000 + */ + public static final int FIVE_THOUSAND = 5000; + + /** + * 1万 + */ + public static final int TEN_THOUSAND = 10000; + + /** + * 五万 + */ + public static final int FIFTY_THOUSAND = 50000; + + /** + * 十万 + */ + public static final int ONE_HUNDRED_THOUSAND = 100000; + + /** + * 999999 + */ + public static final int LESS_THAN_ONE_MILLION = 999999; + + /** + * 一百万 + */ + public static final int ONE_MILLION = 1000000; + + /** + * 9999999 + */ + public static final int TEN_MILLION = 9999999; + + /** + * @ + */ + public static final String ATTR_DELIMITER = "@"; + + /** + * % + */ + public static final String NAT_DELIM = "%"; + + /** + * % + */ + public static final String DOLLAR_DELIM = "${"; + +} diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/GlobalConstants.java b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/GlobalConstants.java similarity index 93% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/GlobalConstants.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/constant/GlobalConstants.java index e52eeaf..56de7ed 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/GlobalConstants.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/GlobalConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.constant; +package com.baiye.constant; /** * @author Hccake 2020/6/9 17:17 diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/HeaderConstants.java b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/HeaderConstants.java similarity index 88% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/HeaderConstants.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/constant/HeaderConstants.java index dac22d9..17c49d7 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/HeaderConstants.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/HeaderConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.constant; +package com.baiye.constant; /** * @author Hccake diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/HttpsConstants.java b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/HttpsConstants.java similarity index 92% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/HttpsConstants.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/constant/HttpsConstants.java index 06682d5..ae9f67f 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/HttpsConstants.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/HttpsConstants.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.core.constant; +package com.baiye.constant; -import com.hccake.ballcat.common.core.https.CompatibleSSLFactory; -import com.hccake.ballcat.common.core.https.SSLSocketFactoryInitException; +import com.baiye.https.CompatibleSSLFactory; +import com.baiye.https.SSLSocketFactoryInitException; import lombok.experimental.UtilityClass; import javax.net.ssl.HostnameVerifier; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/MDCConstants.java b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/MDCConstants.java similarity index 85% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/MDCConstants.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/constant/MDCConstants.java index 20faf46..5fb56d4 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/MDCConstants.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/MDCConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.constant; +package com.baiye.constant; /** * MDC 相关常量 diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/BooleanEnum.java b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/enums/BooleanEnum.java similarity index 88% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/BooleanEnum.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/constant/enums/BooleanEnum.java index 81d5d22..b1619e2 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/BooleanEnum.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/enums/BooleanEnum.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.constant.enums; +package com.baiye.constant.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/ImportModeEnum.java b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/enums/ImportModeEnum.java similarity index 84% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/ImportModeEnum.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/constant/enums/ImportModeEnum.java index 8e738dd..17b3cbb 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/ImportModeEnum.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/constant/enums/ImportModeEnum.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.constant.enums; +package com.baiye.constant.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/exception/BusinessException.java b/ad-distribute-common/common-core/src/main/java/com/baiye/exception/BusinessException.java similarity index 92% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/exception/BusinessException.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/exception/BusinessException.java index bdf945d..629d6b2 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/exception/BusinessException.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/exception/BusinessException.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.core.exception; +package com.baiye.exception; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.ballcat.common.model.result.ResultCode; +import com.baiye.result.ResultCode; import lombok.Getter; /** diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/exception/SqlCheckedException.java b/ad-distribute-common/common-core/src/main/java/com/baiye/exception/SqlCheckedException.java similarity index 82% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/exception/SqlCheckedException.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/exception/SqlCheckedException.java index 3cc8d68..238ef9d 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/exception/SqlCheckedException.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/exception/SqlCheckedException.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.exception; +package com.baiye.exception; -import com.hccake.ballcat.common.model.result.SystemResultCode; +import com.baiye.result.SystemResultCode; /** * sql防注入校验异常 diff --git a/ad-distribute-common/common-core/src/main/java/com/baiye/exception/handler/GlobalException.java b/ad-distribute-common/common-core/src/main/java/com/baiye/exception/handler/GlobalException.java new file mode 100644 index 0000000..94cc0b3 --- /dev/null +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/exception/handler/GlobalException.java @@ -0,0 +1,26 @@ +package com.baiye.exception.handler; + +import com.baiye.exception.BusinessException; +import com.baiye.result.R; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +/** + * @Author YQY + * @Date 2023/8/4 + */ +@Slf4j +@RestControllerAdvice +public class GlobalException { + + /** + * 处理自定义异常 + */ + @ExceptionHandler(value = BusinessException.class) + public R badRequestException(BusinessException e) { + log.error(e.getMessage()); + return R.failed(e.getCode(), e.getMessage()); + } + +} diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/exception/handler/GlobalExceptionHandler.java b/ad-distribute-common/common-core/src/main/java/com/baiye/exception/handler/GlobalExceptionHandler.java similarity index 83% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/exception/handler/GlobalExceptionHandler.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/exception/handler/GlobalExceptionHandler.java index 675a707..0b064fc 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/exception/handler/GlobalExceptionHandler.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/exception/handler/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.exception.handler; +package com.baiye.exception.handler; /** * 异常日志处理类 diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/https/CompatibleSSLFactory.java b/ad-distribute-common/common-core/src/main/java/com/baiye/https/CompatibleSSLFactory.java similarity index 94% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/https/CompatibleSSLFactory.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/https/CompatibleSSLFactory.java index 25cfbd1..2e8bf1a 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/https/CompatibleSSLFactory.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/https/CompatibleSSLFactory.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.core.https; +package com.baiye.https; -import com.hccake.ballcat.common.core.constant.HttpsConstants; -import com.hccake.ballcat.common.util.ArrayUtils; +import com.baiye.constant.HttpsConstants; +import com.baiye.util.ArrayUtils; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/https/SSLSocketFactoryInitException.java b/ad-distribute-common/common-core/src/main/java/com/baiye/https/SSLSocketFactoryInitException.java similarity index 82% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/https/SSLSocketFactoryInitException.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/https/SSLSocketFactoryInitException.java index 049b025..bc728d0 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/https/SSLSocketFactoryInitException.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/https/SSLSocketFactoryInitException.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.https; +package com.baiye.https; /** * @author lingting 2023/2/1 14:29 diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/CustomJavaTimeModule.java b/ad-distribute-common/common-core/src/main/java/com/baiye/jackson/CustomJavaTimeModule.java similarity index 97% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/CustomJavaTimeModule.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/jackson/CustomJavaTimeModule.java index 06196c4..e94da30 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/CustomJavaTimeModule.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/jackson/CustomJavaTimeModule.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.jackson; +package com.baiye.jackson; import cn.hutool.core.date.DatePattern; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullArrayJsonSerializer.java b/ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullArrayJsonSerializer.java similarity index 94% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullArrayJsonSerializer.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullArrayJsonSerializer.java index a58d7ab..debe7db 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullArrayJsonSerializer.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullArrayJsonSerializer.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.jackson; +package com.baiye.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullMapJsonSerializer.java b/ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullMapJsonSerializer.java similarity index 94% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullMapJsonSerializer.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullMapJsonSerializer.java index 0bc254f..8f885d0 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullMapJsonSerializer.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullMapJsonSerializer.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.jackson; +package com.baiye.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullSerializerProvider.java b/ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullSerializerProvider.java similarity index 98% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullSerializerProvider.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullSerializerProvider.java index 67fe251..4f3361d 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullSerializerProvider.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullSerializerProvider.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.jackson; +package com.baiye.jackson; import com.fasterxml.jackson.databind.BeanProperty; import com.fasterxml.jackson.databind.JavaType; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullStringJsonSerializer.java b/ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullStringJsonSerializer.java similarity index 93% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullStringJsonSerializer.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullStringJsonSerializer.java index a1d7ddb..200ab9e 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullStringJsonSerializer.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/jackson/NullStringJsonSerializer.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.jackson; +package com.baiye.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/lock/JavaReentrantLock.java b/ad-distribute-common/common-core/src/main/java/com/baiye/lock/JavaReentrantLock.java similarity index 97% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/lock/JavaReentrantLock.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/lock/JavaReentrantLock.java index dc8c790..c94dfe1 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/lock/JavaReentrantLock.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/lock/JavaReentrantLock.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.lock; +package com.baiye.lock; import lombok.Getter; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/markdown/MarkdownBuilder.java b/ad-distribute-common/common-core/src/main/java/com/baiye/markdown/MarkdownBuilder.java similarity index 98% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/markdown/MarkdownBuilder.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/markdown/MarkdownBuilder.java index e769512..9dba467 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/markdown/MarkdownBuilder.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/markdown/MarkdownBuilder.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.common.core.markdown; +package com.baiye.markdown; import cn.hutool.core.convert.Convert; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.hccake.ballcat.common.util.json.JacksonJsonToolAdapter; +import com.baiye.util.json.JacksonJsonToolAdapter; import lombok.SneakyThrows; import java.util.ArrayList; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/ModifyParamMapRequestWrapper.java b/ad-distribute-common/common-core/src/main/java/com/baiye/request/wrapper/ModifyParamMapRequestWrapper.java similarity index 91% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/ModifyParamMapRequestWrapper.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/request/wrapper/ModifyParamMapRequestWrapper.java index 694ab38..76e6153 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/ModifyParamMapRequestWrapper.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/request/wrapper/ModifyParamMapRequestWrapper.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.request.wrapper; +package com.baiye.request.wrapper; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java b/ad-distribute-common/common-core/src/main/java/com/baiye/request/wrapper/RepeatBodyRequestWrapper.java similarity index 97% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/request/wrapper/RepeatBodyRequestWrapper.java index 4938493..007cfdd 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/request/wrapper/RepeatBodyRequestWrapper.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.request.wrapper; +package com.baiye.request.wrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.util.ObjectUtils; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/spring/BallcatBeanPostProcessor.java b/ad-distribute-common/common-core/src/main/java/com/baiye/spring/BallcatBeanPostProcessor.java similarity index 97% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/spring/BallcatBeanPostProcessor.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/spring/BallcatBeanPostProcessor.java index d6abe0c..79e9f7f 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/spring/BallcatBeanPostProcessor.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/spring/BallcatBeanPostProcessor.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.spring; +package com.baiye.spring; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/ContextComposeBeanPostProcessor.java b/ad-distribute-common/common-core/src/main/java/com/baiye/spring/compose/ContextComposeBeanPostProcessor.java similarity index 72% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/ContextComposeBeanPostProcessor.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/spring/compose/ContextComposeBeanPostProcessor.java index f2c19ae..068c2d9 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/ContextComposeBeanPostProcessor.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/spring/compose/ContextComposeBeanPostProcessor.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.core.spring.compose; +package com.baiye.spring.compose; -import com.hccake.ballcat.common.core.compose.ContextComponent; -import com.hccake.ballcat.common.core.spring.BallcatBeanPostProcessor; +import com.baiye.compose.ContextComponent; +import com.baiye.spring.BallcatBeanPostProcessor; import org.springframework.stereotype.Component; /** diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/SpringContextClosed.java b/ad-distribute-common/common-core/src/main/java/com/baiye/spring/compose/SpringContextClosed.java similarity index 90% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/SpringContextClosed.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/spring/compose/SpringContextClosed.java index 83c8bb9..3454e8e 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/SpringContextClosed.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/spring/compose/SpringContextClosed.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.spring.compose; +package com.baiye.spring.compose; -import com.hccake.ballcat.common.core.compose.ContextComponent; +import com.baiye.compose.ContextComponent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationContext; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractBlockingQueueThread.java b/ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractBlockingQueueThread.java similarity index 90% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractBlockingQueueThread.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractBlockingQueueThread.java index 684c8f7..8635eb6 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractBlockingQueueThread.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractBlockingQueueThread.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.thread; +package com.baiye.thread; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,7 @@ public abstract class AbstractBlockingQueueThread extends AbstractQueueThread queue.put(t); } catch (InterruptedException e) { - Thread.currentThread().interrupt(); + currentThread().interrupt(); } catch (Exception e) { log.error("{} put Object error, param: {}", this.getClass().toString(), t, e); diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractDynamicTimer.java b/ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractDynamicTimer.java similarity index 94% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractDynamicTimer.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractDynamicTimer.java index 8412883..410e270 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractDynamicTimer.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractDynamicTimer.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.thread; +package com.baiye.thread; -import com.hccake.ballcat.common.core.lock.JavaReentrantLock; +import com.baiye.lock.JavaReentrantLock; import lombok.extern.slf4j.Slf4j; import java.util.Comparator; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractQueueThread.java b/ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractQueueThread.java similarity index 97% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractQueueThread.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractQueueThread.java index 2e90aae..4f33d2a 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractQueueThread.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractQueueThread.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.thread; +package com.baiye.thread; -import com.hccake.ballcat.common.core.compose.ContextComponent; +import com.baiye.compose.ContextComponent; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractThreadContextComponent.java b/ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractThreadContextComponent.java similarity index 85% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractThreadContextComponent.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractThreadContextComponent.java index 1dc083b..4b13d22 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractThreadContextComponent.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractThreadContextComponent.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.thread; +package com.baiye.thread; -import com.hccake.ballcat.common.core.compose.ContextComponent; +import com.baiye.compose.ContextComponent; import lombok.extern.slf4j.Slf4j; /** diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractTimer.java b/ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractTimer.java similarity index 92% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractTimer.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractTimer.java index 847a12c..15de41c 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractTimer.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/thread/AbstractTimer.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.thread; +package com.baiye.thread; -import com.hccake.ballcat.common.core.compose.ContextComponent; +import com.baiye.compose.ContextComponent; import lombok.extern.slf4j.Slf4j; import java.util.concurrent.TimeUnit; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/util/FileUtil.java b/ad-distribute-common/common-core/src/main/java/com/baiye/util/FileUtil.java similarity index 98% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/util/FileUtil.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/util/FileUtil.java index 69e8402..72166c0 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/util/FileUtil.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/util/FileUtil.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.util; +package com.baiye.util; import cn.hutool.core.io.IoUtil; import cn.hutool.core.text.StrPool; @@ -6,8 +6,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; -import com.hccake.ballcat.common.core.exception.BusinessException; -import com.hccake.ballcat.common.model.result.BaseResultCode; +import com.baiye.exception.BusinessException; +import com.baiye.result.BaseResultCode; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/util/MobileUtil.java b/ad-distribute-common/common-core/src/main/java/com/baiye/util/MobileUtil.java similarity index 98% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/util/MobileUtil.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/util/MobileUtil.java index 1102968..008cdaf 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/util/MobileUtil.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/util/MobileUtil.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.util; +package com.baiye.util; import org.apache.commons.lang3.StringUtils; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/util/WebUtils.java b/ad-distribute-common/common-core/src/main/java/com/baiye/util/WebUtils.java similarity index 96% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/util/WebUtils.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/util/WebUtils.java index eda4ca1..72e5947 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/util/WebUtils.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/util/WebUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.util; +package com.baiye.util; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/EmptyCurlyToDefaultMessageInterpolator.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/EmptyCurlyToDefaultMessageInterpolator.java similarity index 97% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/EmptyCurlyToDefaultMessageInterpolator.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/EmptyCurlyToDefaultMessageInterpolator.java index c03f848..3a9818d 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/EmptyCurlyToDefaultMessageInterpolator.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/EmptyCurlyToDefaultMessageInterpolator.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.validation; +package com.baiye.validation; import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator; import org.hibernate.validator.spi.resourceloading.ResourceBundleLocator; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfClasses.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/OneOfClasses.java similarity index 87% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfClasses.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/OneOfClasses.java index 1e4ab12..70fcf46 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfClasses.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/OneOfClasses.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.validation.constraints; +package com.baiye.validation.constraints; -import com.hccake.ballcat.common.core.validation.validator.EnumValueValidatorOfClass; +import com.baiye.validation.validator.EnumValueValidatorOfClass; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfInts.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/OneOfInts.java similarity index 87% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfInts.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/OneOfInts.java index 98ae314..72e4576 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfInts.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/OneOfInts.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.validation.constraints; +package com.baiye.validation.constraints; -import com.hccake.ballcat.common.core.validation.validator.EnumValueValidatorOfInt; +import com.baiye.validation.validator.EnumValueValidatorOfInt; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfStrings.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/OneOfStrings.java similarity index 87% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfStrings.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/OneOfStrings.java index 949da2d..9a16c64 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfStrings.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/OneOfStrings.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.validation.constraints; +package com.baiye.validation.constraints; -import com.hccake.ballcat.common.core.validation.validator.EnumValueValidatorOfString; +import com.baiye.validation.validator.EnumValueValidatorOfString; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/ValueOfEnum.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/ValueOfEnum.java similarity index 88% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/ValueOfEnum.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/ValueOfEnum.java index 3958ccf..23e329a 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/ValueOfEnum.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/constraints/ValueOfEnum.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.validation.constraints; +package com.baiye.validation.constraints; -import com.hccake.ballcat.common.core.validation.validator.ValueOfEnumValidator; +import com.baiye.validation.validator.ValueOfEnumValidator; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/CreateGroup.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/group/CreateGroup.java similarity index 64% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/CreateGroup.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/group/CreateGroup.java index 943d7cb..d4127aa 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/CreateGroup.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/group/CreateGroup.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.validation.group; +package com.baiye.validation.group; /** * Validation Group，新建时校验 diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/UpdateGroup.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/group/UpdateGroup.java similarity index 64% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/UpdateGroup.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/group/UpdateGroup.java index c1a7df2..20da1e3 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/UpdateGroup.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/group/UpdateGroup.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.core.validation.group; +package com.baiye.validation.group; /** * Validation Group，更新时校验 diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/EnumValueValidatorOfClass.java similarity index 84% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/EnumValueValidatorOfClass.java index ebc8395..8479330 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/EnumValueValidatorOfClass.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.validation.validator; +package com.baiye.validation.validator; -import com.hccake.ballcat.common.core.validation.constraints.OneOfClasses; +import com.baiye.validation.constraints.OneOfClasses; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/EnumValueValidatorOfInt.java similarity index 84% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/EnumValueValidatorOfInt.java index 252432f..f41bfb3 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/EnumValueValidatorOfInt.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.validation.validator; +package com.baiye.validation.validator; -import com.hccake.ballcat.common.core.validation.constraints.OneOfInts; +import com.baiye.validation.constraints.OneOfInts; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfString.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/EnumValueValidatorOfString.java similarity index 84% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfString.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/EnumValueValidatorOfString.java index 6dcf437..c1a4f5e 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfString.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/EnumValueValidatorOfString.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.validation.validator; +package com.baiye.validation.validator; -import com.hccake.ballcat.common.core.validation.constraints.OneOfStrings; +import com.baiye.validation.constraints.OneOfStrings; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/ValueOfEnumValidator.java b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/ValueOfEnumValidator.java similarity index 91% rename from ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/ValueOfEnumValidator.java rename to ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/ValueOfEnumValidator.java index 5f82e49..73f6404 100644 --- a/ad-distribute-common/common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/ValueOfEnumValidator.java +++ b/ad-distribute-common/common-core/src/main/java/com/baiye/validation/validator/ValueOfEnumValidator.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.core.validation.validator; +package com.baiye.validation.validator; -import com.hccake.ballcat.common.core.validation.constraints.ValueOfEnum; +import com.baiye.validation.constraints.ValueOfEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.reflect.MethodUtils; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/AnnotationHandlerHolder.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/AnnotationHandlerHolder.java similarity index 81% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/AnnotationHandlerHolder.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/AnnotationHandlerHolder.java index 13b9867..27de361 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/AnnotationHandlerHolder.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/AnnotationHandlerHolder.java @@ -1,15 +1,15 @@ -package com.hccake.ballcat.common.desensitize; +package com.baiye; import cn.hutool.core.lang.Assert; -import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.enums.SlideDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.functions.DesensitizeFunction; -import com.hccake.ballcat.common.desensitize.handler.RegexDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SlideDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonRegexDesensitize; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonSimpleDesensitize; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonSlideDesensitize; +import com.baiye.functions.DesensitizeFunction; +import com.baiye.enums.RegexDesensitizationTypeEnum; +import com.baiye.enums.SlideDesensitizationTypeEnum; +import com.baiye.handler.RegexDesensitizationHandler; +import com.baiye.handler.SimpleDesensitizationHandler; +import com.baiye.handler.SlideDesensitizationHandler; +import com.baiye.json.annotation.JsonRegexDesensitize; +import com.baiye.json.annotation.JsonSimpleDesensitize; +import com.baiye.json.annotation.JsonSlideDesensitize; import java.lang.annotation.Annotation; import java.util.Map; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/DesensitizationHandlerHolder.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/DesensitizationHandlerHolder.java similarity index 88% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/DesensitizationHandlerHolder.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/DesensitizationHandlerHolder.java index 0f1fb6b..333ba48 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/DesensitizationHandlerHolder.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/DesensitizationHandlerHolder.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.common.desensitize; +package com.baiye; -import com.hccake.ballcat.common.desensitize.handler.DesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.RegexDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SlideDesensitizationHandler; +import com.baiye.handler.DesensitizationHandler; +import com.baiye.handler.RegexDesensitizationHandler; +import com.baiye.handler.SimpleDesensitizationHandler; +import com.baiye.handler.SlideDesensitizationHandler; import java.util.Map; import java.util.ServiceLoader; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/RegexDesensitizationTypeEnum.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/enums/RegexDesensitizationTypeEnum.java similarity index 93% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/RegexDesensitizationTypeEnum.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/enums/RegexDesensitizationTypeEnum.java index eefe973..e1e0877 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/RegexDesensitizationTypeEnum.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/enums/RegexDesensitizationTypeEnum.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.desensitize.enums; +package com.baiye.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/SlideDesensitizationTypeEnum.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/enums/SlideDesensitizationTypeEnum.java similarity index 94% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/SlideDesensitizationTypeEnum.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/enums/SlideDesensitizationTypeEnum.java index 4983445..87bcc46 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/SlideDesensitizationTypeEnum.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/enums/SlideDesensitizationTypeEnum.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.desensitize.enums; +package com.baiye.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/functions/DesensitizeFunction.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/functions/DesensitizeFunction.java similarity index 85% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/functions/DesensitizeFunction.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/functions/DesensitizeFunction.java index 20ae62f..3a6eac3 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/functions/DesensitizeFunction.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/functions/DesensitizeFunction.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.desensitize.functions; +package com.baiye.functions; import java.lang.annotation.Annotation; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/DesensitizationHandler.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/DesensitizationHandler.java similarity index 68% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/DesensitizationHandler.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/DesensitizationHandler.java index 7516b1a..519a8a9 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/DesensitizationHandler.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/DesensitizationHandler.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.desensitize.handler; +package com.baiye.handler; /** * 脱敏处理器 diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/RegexDesensitizationHandler.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/RegexDesensitizationHandler.java similarity index 85% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/RegexDesensitizationHandler.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/RegexDesensitizationHandler.java index cf6f768..14e2fd4 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/RegexDesensitizationHandler.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/RegexDesensitizationHandler.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.desensitize.handler; +package com.baiye.handler; -import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; +import com.baiye.enums.RegexDesensitizationTypeEnum; /** * 正则替换脱敏处理器，使用正则匹配替换处理原数据 diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SimpleDesensitizationHandler.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/SimpleDesensitizationHandler.java similarity index 86% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SimpleDesensitizationHandler.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/SimpleDesensitizationHandler.java index eb1b31e..fc326ca 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SimpleDesensitizationHandler.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/SimpleDesensitizationHandler.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.desensitize.handler; +package com.baiye.handler; /** * 简单的脱敏处理器，传入源数据直接返回脱敏后的数据 diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SixAsteriskDesensitizationHandler.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/SixAsteriskDesensitizationHandler.java similarity index 87% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SixAsteriskDesensitizationHandler.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/SixAsteriskDesensitizationHandler.java index d149a2c..f64358e 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SixAsteriskDesensitizationHandler.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/SixAsteriskDesensitizationHandler.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.desensitize.handler; +package com.baiye.handler; /** * 【6*脱敏】，不管原文是什么，一律返回6个* eg. ****** diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SlideDesensitizationHandler.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/SlideDesensitizationHandler.java similarity index 92% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SlideDesensitizationHandler.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/SlideDesensitizationHandler.java index 88c8b46..190750d 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SlideDesensitizationHandler.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/handler/SlideDesensitizationHandler.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.desensitize.handler; +package com.baiye.handler; -import com.hccake.ballcat.common.desensitize.enums.SlideDesensitizationTypeEnum; +import com.baiye.enums.SlideDesensitizationTypeEnum; /** * 滑动脱敏处理器，根据左右边界值滑动左右指针，中间处脱敏 diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/DesensitizeStrategy.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/DesensitizeStrategy.java similarity index 84% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/DesensitizeStrategy.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/DesensitizeStrategy.java index a7a6345..97c22a7 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/DesensitizeStrategy.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/DesensitizeStrategy.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.desensitize.json; +package com.baiye.json; /** * 脱敏工具类 定义开启脱敏规则 diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeModule.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/JsonDesensitizeModule.java similarity index 87% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeModule.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/JsonDesensitizeModule.java index 728df79..8c95601 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeModule.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/JsonDesensitizeModule.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.desensitize.json; +package com.baiye.json; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializer.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/JsonDesensitizeSerializer.java similarity index 88% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializer.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/JsonDesensitizeSerializer.java index 66d4844..bf07124 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializer.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/JsonDesensitizeSerializer.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.common.desensitize.json; +package com.baiye.json; +import com.baiye.AnnotationHandlerHolder; +import com.baiye.functions.DesensitizeFunction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import com.hccake.ballcat.common.desensitize.AnnotationHandlerHolder; -import com.hccake.ballcat.common.desensitize.functions.DesensitizeFunction; import java.io.IOException; import java.lang.annotation.Annotation; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializerModifier.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/JsonDesensitizeSerializerModifier.java similarity index 93% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializerModifier.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/JsonDesensitizeSerializerModifier.java index 28e4e2d..92ac84a 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializerModifier.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/JsonDesensitizeSerializerModifier.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.common.desensitize.json; +package com.baiye.json; +import com.baiye.AnnotationHandlerHolder; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.SerializationConfig; import com.fasterxml.jackson.databind.ser.BeanPropertyWriter; import com.fasterxml.jackson.databind.ser.BeanSerializerModifier; -import com.hccake.ballcat.common.desensitize.AnnotationHandlerHolder; import java.lang.annotation.Annotation; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonRegexDesensitize.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/annotation/JsonRegexDesensitize.java similarity index 78% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonRegexDesensitize.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/annotation/JsonRegexDesensitize.java index 802ed21..3365e1b 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonRegexDesensitize.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/annotation/JsonRegexDesensitize.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.desensitize.json.annotation; +package com.baiye.json.annotation; -import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.handler.RegexDesensitizationHandler; +import com.baiye.enums.RegexDesensitizationTypeEnum; +import com.baiye.handler.RegexDesensitizationHandler; import java.lang.annotation.*; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSimpleDesensitize.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/annotation/JsonSimpleDesensitize.java similarity index 76% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSimpleDesensitize.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/annotation/JsonSimpleDesensitize.java index a638efa..87d0228 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSimpleDesensitize.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/annotation/JsonSimpleDesensitize.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.desensitize.json.annotation; +package com.baiye.json.annotation; -import com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler; +import com.baiye.handler.SimpleDesensitizationHandler; import java.lang.annotation.*; diff --git a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSlideDesensitize.java b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/annotation/JsonSlideDesensitize.java similarity index 79% rename from ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSlideDesensitize.java rename to ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/annotation/JsonSlideDesensitize.java index 8b95df4..f34ebc9 100644 --- a/ad-distribute-common/common-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSlideDesensitize.java +++ b/ad-distribute-common/common-desensitize/src/main/java/com/baiye/json/annotation/JsonSlideDesensitize.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.desensitize.json.annotation; +package com.baiye.json.annotation; -import com.hccake.ballcat.common.desensitize.enums.SlideDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.handler.SlideDesensitizationHandler; +import com.baiye.enums.SlideDesensitizationTypeEnum; +import com.baiye.handler.SlideDesensitizationHandler; import java.lang.annotation.*; diff --git a/ad-distribute-common/common-desensitize/src/main/resources/META-INF/services/com.baiye.upms.handler.SimpleDesensitizationHandler b/ad-distribute-common/common-desensitize/src/main/resources/META-INF/services/com.baiye.upms.handler.SimpleDesensitizationHandler new file mode 100644 index 0000000..e731bd0 --- /dev/null +++ b/ad-distribute-common/common-desensitize/src/main/resources/META-INF/services/com.baiye.upms.handler.SimpleDesensitizationHandler @@ -0,0 +1 @@ +com.baiye.upms.handler.SixAsteriskDesensitizationHandler diff --git a/ad-distribute-common/common-desensitize/src/main/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler b/ad-distribute-common/common-desensitize/src/main/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler deleted file mode 100644 index b1429f0..0000000 --- a/ad-distribute-common/common-desensitize/src/main/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler +++ /dev/null @@ -1 +0,0 @@ -com.hccake.ballcat.common.desensitize.handler.SixAsteriskDesensitizationHandler diff --git a/ad-distribute-common/common-desensitize/src/test/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler b/ad-distribute-common/common-desensitize/src/test/resources/META-INF/services/com.baiye.upms.handler.SimpleDesensitizationHandler similarity index 100% rename from ad-distribute-common/common-desensitize/src/test/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler rename to ad-distribute-common/common-desensitize/src/test/resources/META-INF/services/com.baiye.upms.handler.SimpleDesensitizationHandler diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/DynamicMessageSource.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/DynamicMessageSource.java similarity index 95% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/DynamicMessageSource.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/DynamicMessageSource.java index 372f62e..b541e2d 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/DynamicMessageSource.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/DynamicMessageSource.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import lombok.RequiredArgsConstructor; import org.springframework.context.support.AbstractMessageSource; diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nClass.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nClass.java similarity index 88% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nClass.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nClass.java index 55656c0..a104355 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nClass.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nClass.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import java.lang.annotation.*; diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nField.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nField.java similarity index 96% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nField.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nField.java index ce91929..df7cb0a 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nField.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nField.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import org.springframework.core.annotation.AliasFor; diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nIgnore.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nIgnore.java similarity index 86% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nIgnore.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nIgnore.java index 7784395..dc95c41 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nIgnore.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nIgnore.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import java.lang.annotation.*; diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessage.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nMessage.java similarity index 94% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessage.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nMessage.java index 1a466d9..5badbc8 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessage.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nMessage.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageCreateEvent.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nMessageCreateEvent.java similarity index 92% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageCreateEvent.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nMessageCreateEvent.java index 264547f..99ddd5e 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageCreateEvent.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nMessageCreateEvent.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import org.springframework.context.ApplicationEvent; diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageProvider.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nMessageProvider.java similarity index 90% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageProvider.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nMessageProvider.java index e14b8b1..ee4821c 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageProvider.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nMessageProvider.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import java.util.Locale; diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nOptions.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nOptions.java similarity index 84% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nOptions.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nOptions.java index e79581d..994d4ba 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nOptions.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nOptions.java @@ -1,11 +1,13 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import lombok.Data; +import org.springframework.stereotype.Component; /** * @author hccake */ @Data +@Component public class I18nOptions { /** diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nResponseAdvice.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nResponseAdvice.java similarity index 99% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nResponseAdvice.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nResponseAdvice.java index ce7f708..cc1229e 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nResponseAdvice.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/I18nResponseAdvice.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/MessageSourceHierarchicalChanger.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/MessageSourceHierarchicalChanger.java similarity index 97% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/MessageSourceHierarchicalChanger.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/MessageSourceHierarchicalChanger.java index 8edae59..5bb8177 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/MessageSourceHierarchicalChanger.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/MessageSourceHierarchicalChanger.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import org.springframework.context.HierarchicalMessageSource; import org.springframework.context.MessageSource; diff --git a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/WildcardReloadableResourceBundleMessageSource.java b/ad-distribute-common/common-i18n/src/main/java/com/baiye/WildcardReloadableResourceBundleMessageSource.java similarity index 98% rename from ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/WildcardReloadableResourceBundleMessageSource.java rename to ad-distribute-common/common-i18n/src/main/java/com/baiye/WildcardReloadableResourceBundleMessageSource.java index 4ee4886..cffdb97 100644 --- a/ad-distribute-common/common-i18n/src/main/java/com/hccake/ballcat/common/i18n/WildcardReloadableResourceBundleMessageSource.java +++ b/ad-distribute-common/common-i18n/src/main/java/com/baiye/WildcardReloadableResourceBundleMessageSource.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.ReloadableResourceBundleMessageSource; diff --git a/ad-distribute-common/common-i18n/src/test/java/com/hccake/ballcat/common/i18n/DefautlI18nMessageProvider.java b/ad-distribute-common/common-i18n/src/test/java/com/baiye/DefautlI18nMessageProvider.java similarity index 95% rename from ad-distribute-common/common-i18n/src/test/java/com/hccake/ballcat/common/i18n/DefautlI18nMessageProvider.java rename to ad-distribute-common/common-i18n/src/test/java/com/baiye/DefautlI18nMessageProvider.java index 593952e..6b90ab7 100644 --- a/ad-distribute-common/common-i18n/src/test/java/com/hccake/ballcat/common/i18n/DefautlI18nMessageProvider.java +++ b/ad-distribute-common/common-i18n/src/test/java/com/baiye/DefautlI18nMessageProvider.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.i18n; +package com.baiye; import java.util.Locale; import java.util.Map; diff --git a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/IdempotentAspect.java b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/IdempotentAspect.java similarity index 77% rename from ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/IdempotentAspect.java rename to ad-distribute-common/common-idempotent/src/main/java/com/baiye/IdempotentAspect.java index 92adf6e..f86ac8b 100644 --- a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/IdempotentAspect.java +++ b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/IdempotentAspect.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.common.idempotent; +package com.baiye; import cn.hutool.core.lang.Assert; -import com.hccake.ballcat.common.idempotent.annotation.Idempotent; -import com.hccake.ballcat.common.idempotent.exception.IdempotentException; -import com.hccake.ballcat.common.idempotent.key.generator.IdempotentKeyGenerator; -import com.hccake.ballcat.common.idempotent.key.store.IdempotentKeyStore; -import com.hccake.ballcat.common.model.result.BaseResultCode; +import com.baiye.annotation.Idempotent; +import com.baiye.exception.IdempotentException; +import com.baiye.key.generator.IdempotentKeyGenerator; +import com.baiye.key.store.IdempotentKeyStore; +import com.baiye.result.BaseResultCode; import lombok.RequiredArgsConstructor; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/annotation/Idempotent.java b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/annotation/Idempotent.java similarity index 96% rename from ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/annotation/Idempotent.java rename to ad-distribute-common/common-idempotent/src/main/java/com/baiye/annotation/Idempotent.java index 3ee094e..d526192 100644 --- a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/annotation/Idempotent.java +++ b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/annotation/Idempotent.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.idempotent.annotation; +package com.baiye.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/exception/IdempotentException.java b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/exception/IdempotentException.java similarity index 66% rename from ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/exception/IdempotentException.java rename to ad-distribute-common/common-idempotent/src/main/java/com/baiye/exception/IdempotentException.java index 3cc1acf..f336732 100644 --- a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/exception/IdempotentException.java +++ b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/exception/IdempotentException.java @@ -1,6 +1,5 @@ -package com.hccake.ballcat.common.idempotent.exception; +package com.baiye.exception; -import com.hccake.ballcat.common.core.exception.BusinessException; import lombok.EqualsAndHashCode; /** diff --git a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/DefaultIdempotentKeyGenerator.java b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/generator/DefaultIdempotentKeyGenerator.java similarity index 91% rename from ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/DefaultIdempotentKeyGenerator.java rename to ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/generator/DefaultIdempotentKeyGenerator.java index 041d959..2ab41bb 100644 --- a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/DefaultIdempotentKeyGenerator.java +++ b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/generator/DefaultIdempotentKeyGenerator.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.idempotent.key.generator; +package com.baiye.key.generator; -import com.hccake.ballcat.common.idempotent.annotation.Idempotent; -import com.hccake.ballcat.common.util.SpelUtils; +import com.baiye.annotation.Idempotent; +import com.baiye.util.SpelUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.expression.spel.support.StandardEvaluationContext; diff --git a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/IdempotentKeyGenerator.java b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/generator/IdempotentKeyGenerator.java similarity index 77% rename from ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/IdempotentKeyGenerator.java rename to ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/generator/IdempotentKeyGenerator.java index 7904de9..b88ee94 100644 --- a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/IdempotentKeyGenerator.java +++ b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/generator/IdempotentKeyGenerator.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.idempotent.key.generator; +package com.baiye.key.generator; -import com.hccake.ballcat.common.idempotent.annotation.Idempotent; +import com.baiye.annotation.Idempotent; import org.aspectj.lang.JoinPoint; import org.springframework.lang.NonNull; diff --git a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/IdempotentKeyStore.java b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/store/IdempotentKeyStore.java similarity index 91% rename from ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/IdempotentKeyStore.java rename to ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/store/IdempotentKeyStore.java index f3f6ba5..01f9b2f 100644 --- a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/IdempotentKeyStore.java +++ b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/store/IdempotentKeyStore.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.idempotent.key.store; +package com.baiye.key.store; import java.util.concurrent.TimeUnit; diff --git a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/InMemoryIdempotentKeyStore.java b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/store/InMemoryIdempotentKeyStore.java similarity index 93% rename from ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/InMemoryIdempotentKeyStore.java rename to ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/store/InMemoryIdempotentKeyStore.java index 1ba053b..6fe9cf4 100644 --- a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/InMemoryIdempotentKeyStore.java +++ b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/store/InMemoryIdempotentKeyStore.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.idempotent.key.store; +package com.baiye.key.store; import cn.hutool.cache.CacheUtil; import cn.hutool.cache.impl.TimedCache; diff --git a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/RedisIdempotentKeyStore.java b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/store/RedisIdempotentKeyStore.java similarity index 94% rename from ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/RedisIdempotentKeyStore.java rename to ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/store/RedisIdempotentKeyStore.java index 00f90a3..b8b49ab 100644 --- a/ad-distribute-common/common-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/RedisIdempotentKeyStore.java +++ b/ad-distribute-common/common-idempotent/src/main/java/com/baiye/key/store/RedisIdempotentKeyStore.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.idempotent.key.store; +package com.baiye.key.store; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/access/filter/AccessLogFilter.java b/ad-distribute-common/common-log/src/main/java/com/baiye/access/filter/AccessLogFilter.java similarity index 92% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/access/filter/AccessLogFilter.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/access/filter/AccessLogFilter.java index 7f99cb8..1a46649 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/access/filter/AccessLogFilter.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/access/filter/AccessLogFilter.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.common.log.access.filter; +package com.baiye.access.filter; -import com.hccake.ballcat.common.core.constant.MDCConstants; -import com.hccake.ballcat.common.core.request.wrapper.RepeatBodyRequestWrapper; -import com.hccake.ballcat.common.log.access.handler.AccessLogHandler; -import com.hccake.ballcat.common.log.util.LogUtils; +import com.baiye.constant.MDCConstants; +import com.baiye.request.wrapper.RepeatBodyRequestWrapper; +import com.baiye.access.handler.AccessLogHandler; +import com.baiye.util.LogUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.slf4j.MDC; diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/access/handler/AccessLogHandler.java b/ad-distribute-common/common-log/src/main/java/com/baiye/access/handler/AccessLogHandler.java similarity index 94% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/access/handler/AccessLogHandler.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/access/handler/AccessLogHandler.java index ece2a9f..c080109 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/access/handler/AccessLogHandler.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/access/handler/AccessLogHandler.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.log.access.handler; +package com.baiye.access.handler; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/CreateOperationLogging.java b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/CreateOperationLogging.java similarity index 87% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/CreateOperationLogging.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/CreateOperationLogging.java index de03d5f..a0144e2 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/CreateOperationLogging.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/CreateOperationLogging.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.log.operation.annotation; +package com.baiye.operation.annotation; -import com.hccake.ballcat.common.log.operation.enums.OperationTypes; +import com.baiye.operation.enums.OperationTypes; import org.springframework.core.annotation.AliasFor; import java.lang.annotation.Documented; diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/DeleteOperationLogging.java b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/DeleteOperationLogging.java similarity index 87% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/DeleteOperationLogging.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/DeleteOperationLogging.java index 22e7c55..b43bc63 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/DeleteOperationLogging.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/DeleteOperationLogging.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.log.operation.annotation; +package com.baiye.operation.annotation; -import com.hccake.ballcat.common.log.operation.enums.OperationTypes; +import com.baiye.operation.enums.OperationTypes; import org.springframework.core.annotation.AliasFor; import java.lang.annotation.Documented; diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/OperationLogging.java b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/OperationLogging.java similarity index 92% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/OperationLogging.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/OperationLogging.java index 098370e..bea1907 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/OperationLogging.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/OperationLogging.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.log.operation.annotation; +package com.baiye.operation.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/ReadOperationLogging.java b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/ReadOperationLogging.java similarity index 87% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/ReadOperationLogging.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/ReadOperationLogging.java index fa93a13..c7aba86 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/ReadOperationLogging.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/ReadOperationLogging.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.log.operation.annotation; +package com.baiye.operation.annotation; -import com.hccake.ballcat.common.log.operation.enums.OperationTypes; +import com.baiye.operation.enums.OperationTypes; import org.springframework.core.annotation.AliasFor; import java.lang.annotation.Documented; diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/UpdateOperationLogging.java b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/UpdateOperationLogging.java similarity index 87% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/UpdateOperationLogging.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/UpdateOperationLogging.java index 82d937a..ac163de 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/UpdateOperationLogging.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/annotation/UpdateOperationLogging.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.log.operation.annotation; +package com.baiye.operation.annotation; -import com.hccake.ballcat.common.log.operation.enums.OperationTypes; +import com.baiye.operation.enums.OperationTypes; import org.springframework.core.annotation.AliasFor; import java.lang.annotation.Documented; diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/aspect/OperationLogAspect.java b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/aspect/OperationLogAspect.java similarity index 84% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/aspect/OperationLogAspect.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/operation/aspect/OperationLogAspect.java index 72ec413..fd8d680 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/aspect/OperationLogAspect.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/aspect/OperationLogAspect.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.log.operation.aspect; +package com.baiye.operation.aspect; -import com.hccake.ballcat.common.log.operation.annotation.OperationLogging; -import com.hccake.ballcat.common.log.operation.handler.OperationLogHandler; +import com.baiye.operation.annotation.OperationLogging; +import com.baiye.operation.handler.OperationLogHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; @@ -25,8 +25,8 @@ public class OperationLogAspect { private final OperationLogHandler operationLogHandler; - @Around("execution(@(@com.hccake.ballcat.common.log.operation.annotation.OperationLogging *) * *(..)) " - + "|| @annotation(com.hccake.ballcat.common.log.operation.annotation.OperationLogging)") + @Around("execution(@(@com.baiye.operation.annotation.OperationLogging *) * *(..)) " + + "|| @annotation(com.baiye.operation.annotation.OperationLogging)") public Object around(ProceedingJoinPoint joinPoint) throws Throwable { // 开始时间 long startTime = System.currentTimeMillis(); diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/LogStatusEnum.java b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/enums/LogStatusEnum.java similarity index 84% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/LogStatusEnum.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/operation/enums/LogStatusEnum.java index 8800f1f..22020ef 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/LogStatusEnum.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/enums/LogStatusEnum.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.log.operation.enums; +package com.baiye.operation.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/OperationTypes.java b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/enums/OperationTypes.java similarity index 92% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/OperationTypes.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/operation/enums/OperationTypes.java index 5114aa5..5928395 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/OperationTypes.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/enums/OperationTypes.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.log.operation.enums; +package com.baiye.operation.enums; /** * 操作类型的接口，用户可以继承此接口以便自定义类型 diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/AbstractOperationLogHandler.java b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/handler/AbstractOperationLogHandler.java similarity index 96% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/AbstractOperationLogHandler.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/operation/handler/AbstractOperationLogHandler.java index 8455d5b..50bdb4a 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/AbstractOperationLogHandler.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/handler/AbstractOperationLogHandler.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.common.log.operation.handler; +package com.baiye.operation.handler; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ArrayUtil; -import com.hccake.ballcat.common.util.JsonUtils; +import com.baiye.util.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/OperationLogHandler.java b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/handler/OperationLogHandler.java similarity index 90% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/OperationLogHandler.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/operation/handler/OperationLogHandler.java index d876d0d..92dd4e2 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/OperationLogHandler.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/operation/handler/OperationLogHandler.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.log.operation.handler; +package com.baiye.operation.handler; -import com.hccake.ballcat.common.log.operation.annotation.OperationLogging; +import com.baiye.operation.annotation.OperationLogging; import org.aspectj.lang.ProceedingJoinPoint; /** diff --git a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/util/LogUtils.java b/ad-distribute-common/common-log/src/main/java/com/baiye/util/LogUtils.java similarity index 98% rename from ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/util/LogUtils.java rename to ad-distribute-common/common-log/src/main/java/com/baiye/util/LogUtils.java index 012bb1a..5f9b59d 100644 --- a/ad-distribute-common/common-log/src/main/java/com/hccake/ballcat/common/log/util/LogUtils.java +++ b/ad-distribute-common/common-log/src/main/java/com/baiye/util/LogUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.log.util; +package com.baiye.util; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; diff --git a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageParam.java b/ad-distribute-common/common-model/src/main/java/com/baiye/domain/PageParam.java similarity index 96% rename from ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageParam.java rename to ad-distribute-common/common-model/src/main/java/com/baiye/domain/PageParam.java index c2d51d7..ad7c202 100644 --- a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageParam.java +++ b/ad-distribute-common/common-model/src/main/java/com/baiye/domain/PageParam.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.model.domain; +package com.baiye.domain; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageResult.java b/ad-distribute-common/common-model/src/main/java/com/baiye/domain/PageResult.java similarity index 93% rename from ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageResult.java rename to ad-distribute-common/common-model/src/main/java/com/baiye/domain/PageResult.java index 34191db..96f5175 100644 --- a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageResult.java +++ b/ad-distribute-common/common-model/src/main/java/com/baiye/domain/PageResult.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.model.domain; +package com.baiye.domain; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageableConstants.java b/ad-distribute-common/common-model/src/main/java/com/baiye/domain/PageableConstants.java similarity index 97% rename from ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageableConstants.java rename to ad-distribute-common/common-model/src/main/java/com/baiye/domain/PageableConstants.java index b3c2ae8..21ecc29 100644 --- a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageableConstants.java +++ b/ad-distribute-common/common-model/src/main/java/com/baiye/domain/PageableConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.model.domain; +package com.baiye.domain; import cn.hutool.core.collection.CollUtil; diff --git a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/SelectData.java b/ad-distribute-common/common-model/src/main/java/com/baiye/domain/SelectData.java similarity index 94% rename from ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/SelectData.java rename to ad-distribute-common/common-model/src/main/java/com/baiye/domain/SelectData.java index 61a87fb..188e968 100644 --- a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/domain/SelectData.java +++ b/ad-distribute-common/common-model/src/main/java/com/baiye/domain/SelectData.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.model.domain; +package com.baiye.domain; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/entity/BaseEntity.java b/ad-distribute-common/common-model/src/main/java/com/baiye/entity/BaseEntity.java similarity index 94% rename from ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/entity/BaseEntity.java rename to ad-distribute-common/common-model/src/main/java/com/baiye/entity/BaseEntity.java index d147993..979c493 100644 --- a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/entity/BaseEntity.java +++ b/ad-distribute-common/common-model/src/main/java/com/baiye/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.model.entity; +package com.baiye.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/entity/LogicDeletedBaseEntity.java b/ad-distribute-common/common-model/src/main/java/com/baiye/entity/LogicDeletedBaseEntity.java similarity index 93% rename from ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/entity/LogicDeletedBaseEntity.java rename to ad-distribute-common/common-model/src/main/java/com/baiye/entity/LogicDeletedBaseEntity.java index 90a81e5..3c58473 100644 --- a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/entity/LogicDeletedBaseEntity.java +++ b/ad-distribute-common/common-model/src/main/java/com/baiye/entity/LogicDeletedBaseEntity.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.model.entity; +package com.baiye.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/BaseResultCode.java b/ad-distribute-common/common-model/src/main/java/com/baiye/result/BaseResultCode.java similarity index 94% rename from ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/BaseResultCode.java rename to ad-distribute-common/common-model/src/main/java/com/baiye/result/BaseResultCode.java index 3df70ea..fd0fefc 100644 --- a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/BaseResultCode.java +++ b/ad-distribute-common/common-model/src/main/java/com/baiye/result/BaseResultCode.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.model.result; +package com.baiye.result; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/R.java b/ad-distribute-common/common-model/src/main/java/com/baiye/result/R.java similarity index 93% rename from ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/R.java rename to ad-distribute-common/common-model/src/main/java/com/baiye/result/R.java index 271feb1..f016321 100644 --- a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/R.java +++ b/ad-distribute-common/common-model/src/main/java/com/baiye/result/R.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.model.result; +package com.baiye.result; -import com.hccake.ballcat.common.i18n.I18nClass; +import com.baiye.I18nClass; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.Accessors; diff --git a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/ResultCode.java b/ad-distribute-common/common-model/src/main/java/com/baiye/result/ResultCode.java similarity index 84% rename from ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/ResultCode.java rename to ad-distribute-common/common-model/src/main/java/com/baiye/result/ResultCode.java index 4070931..f2b0e39 100644 --- a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/ResultCode.java +++ b/ad-distribute-common/common-model/src/main/java/com/baiye/result/ResultCode.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.model.result; +package com.baiye.result; /** * @author Hccake diff --git a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/SystemResultCode.java b/ad-distribute-common/common-model/src/main/java/com/baiye/result/SystemResultCode.java similarity index 97% rename from ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/SystemResultCode.java rename to ad-distribute-common/common-model/src/main/java/com/baiye/result/SystemResultCode.java index 6c78ab6..968f748 100644 --- a/ad-distribute-common/common-model/src/main/java/com/hccake/ballcat/common/model/result/SystemResultCode.java +++ b/ad-distribute-common/common-model/src/main/java/com/baiye/result/SystemResultCode.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.model.result; +package com.baiye.result; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/RedisHelper.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/RedisHelper.java similarity index 99% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/RedisHelper.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/RedisHelper.java index 205c847..76ab09f 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/RedisHelper.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/RedisHelper.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis; +package com.baiye; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Range; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/CacheStringAspect.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/CacheStringAspect.java similarity index 89% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/CacheStringAspect.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/core/CacheStringAspect.java index 115a04b..388b144 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/CacheStringAspect.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/CacheStringAspect.java @@ -1,18 +1,18 @@ -package com.hccake.ballcat.common.redis.core; - -import com.hccake.ballcat.common.redis.RedisHelper; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; -import com.hccake.ballcat.common.redis.core.annotation.CacheDel; -import com.hccake.ballcat.common.redis.core.annotation.CacheDels; -import com.hccake.ballcat.common.redis.core.annotation.CachePut; -import com.hccake.ballcat.common.redis.core.annotation.Cached; -import com.hccake.ballcat.common.redis.lock.DistributedLock; -import com.hccake.ballcat.common.redis.operation.CacheDelOps; -import com.hccake.ballcat.common.redis.operation.CacheDelsOps; -import com.hccake.ballcat.common.redis.operation.CachePutOps; -import com.hccake.ballcat.common.redis.operation.CachedOps; -import com.hccake.ballcat.common.redis.operation.function.VoidMethod; -import com.hccake.ballcat.common.redis.serialize.CacheSerializer; +package com.baiye.core; + +import com.baiye.RedisHelper; +import com.baiye.upms.config.CachePropertiesHolder; +import com.baiye.core.annotation.Cached; +import com.baiye.lock.DistributedLock; +import com.baiye.operation.CacheDelOps; +import com.baiye.operation.CacheDelsOps; +import com.baiye.operation.CachePutOps; +import com.baiye.operation.CachedOps; +import com.baiye.operation.function.VoidMethod; +import com.baiye.serialize.CacheSerializer; +import com.baiye.core.annotation.CacheDel; +import com.baiye.core.annotation.CacheDels; +import com.baiye.core.annotation.CachePut; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -57,7 +57,7 @@ public class CacheStringAspect { this.cacheSerializer = cacheSerializer; } - @Pointcut("execution(@(@com.hccake.ballcat.common.redis.core.annotation.MetaCacheAnnotation *) * *(..))") + @Pointcut("execution(@(@com.baiye.core.annotation.MetaCacheAnnotation *) * *(..))") public void pointCut() { // do nothing } diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/KeyGenerator.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/KeyGenerator.java similarity index 93% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/KeyGenerator.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/core/KeyGenerator.java index c3e2a05..1109c98 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/KeyGenerator.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/KeyGenerator.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.common.redis.core; +package com.baiye.core; import cn.hutool.core.lang.Assert; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; -import com.hccake.ballcat.common.util.SpelUtils; +import com.baiye.upms.config.CachePropertiesHolder; +import com.baiye.util.SpelUtils; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.util.StringUtils; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDel.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/CacheDel.java similarity index 94% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDel.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/CacheDel.java index 6f894f1..f61e6df 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDel.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/CacheDel.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.core.annotation; +package com.baiye.core.annotation; import java.lang.annotation.*; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDels.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/CacheDels.java similarity index 81% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDels.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/CacheDels.java index c2752eb..83cd7ed 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDels.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/CacheDels.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.core.annotation; +package com.baiye.core.annotation; import java.lang.annotation.*; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CachePut.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/CachePut.java similarity index 93% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CachePut.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/CachePut.java index 822c2f5..66cff9e 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CachePut.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/CachePut.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.core.annotation; +package com.baiye.core.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/Cached.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/Cached.java similarity index 93% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/Cached.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/Cached.java index 793a4b1..a673742 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/Cached.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/Cached.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.core.annotation; +package com.baiye.core.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/MetaCacheAnnotation.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/MetaCacheAnnotation.java similarity index 81% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/MetaCacheAnnotation.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/MetaCacheAnnotation.java index b80bf8b..c9aefe1 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/MetaCacheAnnotation.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/core/annotation/MetaCacheAnnotation.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.core.annotation; +package com.baiye.core.annotation; import java.lang.annotation.*; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractDeletedKeyEventMessageListener.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractDeletedKeyEventMessageListener.java similarity index 93% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractDeletedKeyEventMessageListener.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractDeletedKeyEventMessageListener.java index 43da41a..8110aae 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractDeletedKeyEventMessageListener.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractDeletedKeyEventMessageListener.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.keyevent.listener; +package com.baiye.keyevent.listener; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.listener.PatternTopic; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractExpiredKeyEventMessageListener.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractExpiredKeyEventMessageListener.java similarity index 94% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractExpiredKeyEventMessageListener.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractExpiredKeyEventMessageListener.java index 91c1a77..6dbca3e 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractExpiredKeyEventMessageListener.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractExpiredKeyEventMessageListener.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.keyevent.listener; +package com.baiye.keyevent.listener; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.listener.KeyExpirationEventMessageListener; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractKeySpaceEventMessageListener.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractKeySpaceEventMessageListener.java similarity index 97% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractKeySpaceEventMessageListener.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractKeySpaceEventMessageListener.java index caa3ac6..6d85071 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractKeySpaceEventMessageListener.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractKeySpaceEventMessageListener.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.keyevent.listener; +package com.baiye.keyevent.listener; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractSetKeyEventMessageListener.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractSetKeyEventMessageListener.java similarity index 93% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractSetKeyEventMessageListener.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractSetKeyEventMessageListener.java index 12e83a3..25ecb1c 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractSetKeyEventMessageListener.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/AbstractSetKeyEventMessageListener.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.keyevent.listener; +package com.baiye.keyevent.listener; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.listener.PatternTopic; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultDeletedKeyEventMessageListener.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/DefaultDeletedKeyEventMessageListener.java similarity index 92% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultDeletedKeyEventMessageListener.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/DefaultDeletedKeyEventMessageListener.java index 47c78d4..4163789 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultDeletedKeyEventMessageListener.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/DefaultDeletedKeyEventMessageListener.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.keyevent.listener; +package com.baiye.keyevent.listener; -import com.hccake.ballcat.common.redis.keyevent.template.KeyDeletedEventMessageTemplate; +import com.baiye.keyevent.template.KeyDeletedEventMessageTemplate; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.ObjectProvider; import org.springframework.data.redis.connection.Message; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultExpiredKeyEventMessageListener.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/DefaultExpiredKeyEventMessageListener.java similarity index 92% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultExpiredKeyEventMessageListener.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/DefaultExpiredKeyEventMessageListener.java index efc138d..0ed57df 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultExpiredKeyEventMessageListener.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/DefaultExpiredKeyEventMessageListener.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.keyevent.listener; +package com.baiye.keyevent.listener; -import com.hccake.ballcat.common.redis.keyevent.template.KeyExpiredEventMessageTemplate; +import com.baiye.keyevent.template.KeyExpiredEventMessageTemplate; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.ObjectProvider; import org.springframework.data.redis.connection.Message; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultSetKeyEventMessageListener.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/DefaultSetKeyEventMessageListener.java similarity index 92% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultSetKeyEventMessageListener.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/DefaultSetKeyEventMessageListener.java index 66a983e..10c9efb 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultSetKeyEventMessageListener.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/listener/DefaultSetKeyEventMessageListener.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.keyevent.listener; +package com.baiye.keyevent.listener; -import com.hccake.ballcat.common.redis.keyevent.template.KeySetEventMessageTemplate; +import com.baiye.keyevent.template.KeySetEventMessageTemplate; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.ObjectProvider; import org.springframework.data.redis.connection.Message; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/package-info.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/package-info.java similarity index 59% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/package-info.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/package-info.java index b521976..7cc949f 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/package-info.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/package-info.java @@ -1,4 +1,4 @@ /** * 对redis key 新增/修改/删除/过期事件监听的封装 */ -package com.hccake.ballcat.common.redis.keyevent; \ No newline at end of file +package com.baiye.keyevent; \ No newline at end of file diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyDeletedEventMessageTemplate.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeyDeletedEventMessageTemplate.java similarity index 75% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyDeletedEventMessageTemplate.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeyDeletedEventMessageTemplate.java index 734fdc2..eb708df 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyDeletedEventMessageTemplate.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeyDeletedEventMessageTemplate.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.keyevent.template; +package com.baiye.keyevent.template; /** * key event message for redis key deleted event diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyEventMessageTemplate.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeyEventMessageTemplate.java similarity index 89% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyEventMessageTemplate.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeyEventMessageTemplate.java index 99607ad..48a90a7 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyEventMessageTemplate.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeyEventMessageTemplate.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.keyevent.template; +package com.baiye.keyevent.template; import org.springframework.lang.Nullable; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyExpiredEventMessageTemplate.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeyExpiredEventMessageTemplate.java similarity index 75% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyExpiredEventMessageTemplate.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeyExpiredEventMessageTemplate.java index 71937b9..ac7cc3f 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyExpiredEventMessageTemplate.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeyExpiredEventMessageTemplate.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.keyevent.template; +package com.baiye.keyevent.template; /** * key event message for redis key expired event diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeySetEventMessageTemplate.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeySetEventMessageTemplate.java similarity index 75% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeySetEventMessageTemplate.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeySetEventMessageTemplate.java index 71b0aca..b5c2e52 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeySetEventMessageTemplate.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/keyevent/template/KeySetEventMessageTemplate.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.keyevent.template; +package com.baiye.keyevent.template; /** * key event message for redis set key event diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/listener/AbstractMessageEventListener.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/listener/AbstractMessageEventListener.java similarity index 93% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/listener/AbstractMessageEventListener.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/listener/AbstractMessageEventListener.java index eac6d99..ee0a43b 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/listener/AbstractMessageEventListener.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/listener/AbstractMessageEventListener.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.listener; +package com.baiye.listener; -import com.hccake.ballcat.common.util.JsonUtils; +import com.baiye.util.JsonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.core.StringRedisTemplate; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/listener/MessageEventListener.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/listener/MessageEventListener.java similarity index 86% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/listener/MessageEventListener.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/listener/MessageEventListener.java index 39adc0d..593d0a4 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/listener/MessageEventListener.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/listener/MessageEventListener.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.listener; +package com.baiye.listener; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.listener.Topic; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/Action.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/Action.java similarity index 86% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/Action.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/lock/Action.java index c1df4c5..59112ed 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/Action.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/Action.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.redis.lock; +package com.baiye.lock; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; -import com.hccake.ballcat.common.redis.lock.function.ThrowingExecutor; +import com.baiye.upms.config.CachePropertiesHolder; +import com.baiye.lock.function.ThrowingExecutor; import java.util.concurrent.TimeUnit; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/CacheLock.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/CacheLock.java similarity index 93% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/CacheLock.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/lock/CacheLock.java index 1926799..994df1b 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/CacheLock.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/CacheLock.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.redis.lock; +package com.baiye.lock; -import com.hccake.ballcat.common.redis.RedisHelper; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; +import com.baiye.RedisHelper; +import com.baiye.upms.config.CachePropertiesHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.script.DefaultRedisScript; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/DistributedLock.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/DistributedLock.java similarity index 93% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/DistributedLock.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/lock/DistributedLock.java index 9670f32..855add4 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/DistributedLock.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/DistributedLock.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.redis.lock; +package com.baiye.lock; -import com.hccake.ballcat.common.redis.lock.function.ExceptionHandler; -import com.hccake.ballcat.common.redis.lock.function.ThrowingExecutor; +import com.baiye.lock.function.ExceptionHandler; +import com.baiye.lock.function.ThrowingExecutor; import org.springframework.util.Assert; import java.util.UUID; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/StateHandler.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/StateHandler.java similarity index 86% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/StateHandler.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/lock/StateHandler.java index 5654af6..1d859a4 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/StateHandler.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/StateHandler.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.lock; +package com.baiye.lock; -import com.hccake.ballcat.common.redis.lock.function.ExceptionHandler; +import com.baiye.lock.function.ExceptionHandler; import java.util.function.Supplier; import java.util.function.UnaryOperator; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ExceptionHandler.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/function/ExceptionHandler.java similarity index 82% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ExceptionHandler.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/lock/function/ExceptionHandler.java index 70b4c05..e51d5ba 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ExceptionHandler.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/function/ExceptionHandler.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.lock.function; +package com.baiye.lock.function; /** * 异常处理器，可在处理完异常后再次抛出异常 diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ThrowingExecutor.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/function/ThrowingExecutor.java similarity index 82% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ThrowingExecutor.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/lock/function/ThrowingExecutor.java index e822b1b..57c894a 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ThrowingExecutor.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/lock/function/ThrowingExecutor.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.lock.function; +package com.baiye.lock.function; /** * 允许抛出异常的执行器 diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/AbstractCacheOps.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/AbstractCacheOps.java similarity index 84% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/AbstractCacheOps.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/operation/AbstractCacheOps.java index 4c684e4..6545855 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/AbstractCacheOps.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/AbstractCacheOps.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.operation; +package com.baiye.operation; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; +import com.baiye.upms.config.CachePropertiesHolder; import org.aspectj.lang.ProceedingJoinPoint; /** diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelOps.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CacheDelOps.java similarity index 77% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelOps.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CacheDelOps.java index 17228c0..ace425f 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelOps.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CacheDelOps.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.operation; +package com.baiye.operation; -import com.hccake.ballcat.common.redis.operation.function.VoidMethod; +import com.baiye.operation.function.VoidMethod; import org.aspectj.lang.ProceedingJoinPoint; /** diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelsOps.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CacheDelsOps.java similarity index 78% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelsOps.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CacheDelsOps.java index e3b8f22..98955a6 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelsOps.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CacheDelsOps.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.operation; +package com.baiye.operation; -import com.hccake.ballcat.common.redis.operation.function.VoidMethod; +import com.baiye.operation.function.VoidMethod; import org.aspectj.lang.ProceedingJoinPoint; /** diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachePutOps.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CachePutOps.java similarity index 90% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachePutOps.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CachePutOps.java index 0e2b314..6131413 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachePutOps.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CachePutOps.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.operation; +package com.baiye.operation; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachedOps.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CachedOps.java similarity index 96% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachedOps.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CachedOps.java index 60699a6..db3112a 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachedOps.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/CachedOps.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.operation; +package com.baiye.operation; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/ResultMethod.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/function/ResultMethod.java similarity index 76% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/ResultMethod.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/operation/function/ResultMethod.java index c2813db..8b29cd8 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/ResultMethod.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/function/ResultMethod.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.operation.function; +package com.baiye.operation.function; /** * @author Hccake diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/VoidMethod.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/function/VoidMethod.java similarity index 74% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/VoidMethod.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/operation/function/VoidMethod.java index 0c7c024..ab2020c 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/VoidMethod.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/operation/function/VoidMethod.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.operation.function; +package com.baiye.operation.function; /** * @author Hccake diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/IRedisPrefixConverter.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/prefix/IRedisPrefixConverter.java similarity index 97% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/IRedisPrefixConverter.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/prefix/IRedisPrefixConverter.java index f4492b7..eee9c18 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/IRedisPrefixConverter.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/prefix/IRedisPrefixConverter.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.prefix; +package com.baiye.prefix; import cn.hutool.core.text.CharSequenceUtil; import org.slf4j.Logger; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/impl/DefaultRedisPrefixConverter.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/prefix/impl/DefaultRedisPrefixConverter.java similarity index 75% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/impl/DefaultRedisPrefixConverter.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/prefix/impl/DefaultRedisPrefixConverter.java index e4bb074..e11fb99 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/impl/DefaultRedisPrefixConverter.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/prefix/impl/DefaultRedisPrefixConverter.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.prefix.impl; +package com.baiye.prefix.impl; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; +import com.baiye.prefix.IRedisPrefixConverter; /** * redis key前缀默认转换器 diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/CacheSerializer.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/CacheSerializer.java similarity index 97% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/CacheSerializer.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/CacheSerializer.java index 455c6f9..572c1d3 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/CacheSerializer.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/CacheSerializer.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.serialize; +package com.baiye.serialize; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.type.TypeFactory; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/JacksonSerializer.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/JacksonSerializer.java similarity index 95% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/JacksonSerializer.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/JacksonSerializer.java index b7ba826..3a8510d 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/JacksonSerializer.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/JacksonSerializer.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.serialize; +package com.baiye.serialize; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixJdkRedisSerializer.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/PrefixJdkRedisSerializer.java similarity index 87% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixJdkRedisSerializer.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/PrefixJdkRedisSerializer.java index 4d0e097..62f7f10 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixJdkRedisSerializer.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/PrefixJdkRedisSerializer.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.serialize; +package com.baiye.serialize; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; +import com.baiye.prefix.IRedisPrefixConverter; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixStringRedisSerializer.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/PrefixStringRedisSerializer.java similarity index 88% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixStringRedisSerializer.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/PrefixStringRedisSerializer.java index 7184311..83142ea 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixStringRedisSerializer.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/serialize/PrefixStringRedisSerializer.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.redis.serialize; +package com.baiye.serialize; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; +import com.baiye.prefix.IRedisPrefixConverter; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.serializer.StringRedisSerializer; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/thread/AbstractRedisThread.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/thread/AbstractRedisThread.java similarity index 94% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/thread/AbstractRedisThread.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/thread/AbstractRedisThread.java index 09f5c3a..8f7feab 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/thread/AbstractRedisThread.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/thread/AbstractRedisThread.java @@ -1,9 +1,8 @@ -package com.hccake.ballcat.common.redis.thread; +package com.baiye.thread; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.ballcat.common.core.thread.AbstractQueueThread; -import com.hccake.ballcat.common.redis.RedisHelper; -import com.hccake.ballcat.common.util.JsonUtils; +import com.baiye.RedisHelper; +import com.baiye.util.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.Nullable; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/config/CacheProperties.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/upms/config/CacheProperties.java similarity index 95% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/config/CacheProperties.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/upms/config/CacheProperties.java index c1a7d27..fac57d1 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/config/CacheProperties.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/upms/config/CacheProperties.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.config; +package com.baiye.upms.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/config/CachePropertiesHolder.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/upms/config/CachePropertiesHolder.java similarity index 95% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/config/CachePropertiesHolder.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/upms/config/CachePropertiesHolder.java index aa657d1..15be731 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/config/CachePropertiesHolder.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/upms/config/CachePropertiesHolder.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.config; +package com.baiye.upms.config; /** * 缓存配置持有者，方便静态获取配置信息 diff --git a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/config/KeyEventConfig.java b/ad-distribute-common/common-redis/src/main/java/com/baiye/upms/config/KeyEventConfig.java similarity index 81% rename from ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/config/KeyEventConfig.java rename to ad-distribute-common/common-redis/src/main/java/com/baiye/upms/config/KeyEventConfig.java index 6784a27..c2edaa6 100644 --- a/ad-distribute-common/common-redis/src/main/java/com/hccake/ballcat/common/redis/config/KeyEventConfig.java +++ b/ad-distribute-common/common-redis/src/main/java/com/baiye/upms/config/KeyEventConfig.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.redis.config; +package com.baiye.upms.config; import lombok.Getter; import lombok.Setter; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/charset/GSMCharset.java b/ad-distribute-common/common-util/src/main/java/com/baiye/charset/GSMCharset.java similarity index 99% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/charset/GSMCharset.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/charset/GSMCharset.java index 47a9859..f9722b7 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/charset/GSMCharset.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/charset/GSMCharset.java @@ -11,7 +11,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.hccake.ballcat.common.charset; +package com.baiye.charset; /** * This class encodes and decodes Java Strings to and from the SMS default alphabet. It diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/exception/CommandTimeoutException.java b/ad-distribute-common/common-util/src/main/java/com/baiye/exception/CommandTimeoutException.java similarity index 70% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/exception/CommandTimeoutException.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/exception/CommandTimeoutException.java index 7fad962..3aaf9c9 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/exception/CommandTimeoutException.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/exception/CommandTimeoutException.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.exception; +package com.baiye.exception; /** * @author lingting 2022/7/15 15:33 diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/queue/WaitQueue.java b/ad-distribute-common/common-util/src/main/java/com/baiye/queue/WaitQueue.java similarity index 95% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/queue/WaitQueue.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/queue/WaitQueue.java index 0878d20..8d2f518 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/queue/WaitQueue.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/queue/WaitQueue.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.queue; +package com.baiye.queue; import java.util.Collection; import java.util.concurrent.LinkedBlockingQueue; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/system/Command.java b/ad-distribute-common/common-util/src/main/java/com/baiye/system/Command.java similarity index 95% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/system/Command.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/system/Command.java index 44f5eca..6fdd543 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/system/Command.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/system/Command.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.common.system; +package com.baiye.system; -import com.hccake.ballcat.common.exception.CommandTimeoutException; -import com.hccake.ballcat.common.util.FileUtils; -import com.hccake.ballcat.common.util.SystemUtils; +import com.baiye.util.FileUtils; +import com.baiye.exception.CommandTimeoutException; +import com.baiye.util.SystemUtils; import org.springframework.util.StringUtils; import java.io.File; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/system/CommandResult.java b/ad-distribute-common/common-util/src/main/java/com/baiye/system/CommandResult.java similarity index 95% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/system/CommandResult.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/system/CommandResult.java index 22f65f0..401fb0f 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/system/CommandResult.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/system/CommandResult.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.system; +package com.baiye.system; -import com.hccake.ballcat.common.util.StreamUtils; +import com.baiye.util.StreamUtils; import lombok.Getter; import org.springframework.util.StringUtils; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/system/StopWatch.java b/ad-distribute-common/common-util/src/main/java/com/baiye/system/StopWatch.java similarity index 96% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/system/StopWatch.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/system/StopWatch.java index 37748ec..73ebd47 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/system/StopWatch.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/system/StopWatch.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.system; +package com.baiye.system; import java.util.concurrent.TimeUnit; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/thread/ThreadPool.java b/ad-distribute-common/common-util/src/main/java/com/baiye/thread/ThreadPool.java similarity index 98% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/thread/ThreadPool.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/thread/ThreadPool.java index 15552e9..9200b4a 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/thread/ThreadPool.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/thread/ThreadPool.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.thread; +package com.baiye.thread; import lombok.AccessLevel; import lombok.Getter; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/ArrayUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/ArrayUtils.java similarity index 93% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/ArrayUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/ArrayUtils.java index d048f37..90ae6ce 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/ArrayUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/ArrayUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import lombok.experimental.UtilityClass; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/BooleanUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/BooleanUtils.java similarity index 95% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/BooleanUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/BooleanUtils.java index 2cdaace..f782650 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/BooleanUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/BooleanUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import lombok.experimental.UtilityClass; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/ClassUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/ClassUtils.java similarity index 99% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/ClassUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/ClassUtils.java index 102bcd3..eecd755 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/ClassUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/ClassUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import cn.hutool.core.util.ClassUtil; import java.io.File; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/EnvironmentUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/EnvironmentUtils.java similarity index 99% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/EnvironmentUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/EnvironmentUtils.java index c5227ae..1924b52 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/EnvironmentUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/EnvironmentUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import lombok.Getter; import lombok.Setter; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/FileUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/FileUtils.java similarity index 99% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/FileUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/FileUtils.java index e569a03..cab9cf0 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/FileUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/FileUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/HtmlUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/HtmlUtils.java similarity index 97% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/HtmlUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/HtmlUtils.java index 801c7b4..9750224 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/HtmlUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/HtmlUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import cn.hutool.core.text.CharSequenceUtil; import org.jsoup.Jsoup; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/ImageUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/ImageUtils.java similarity index 99% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/ImageUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/ImageUtils.java index 7b9e1ff..b3c7f2e 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/ImageUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/ImageUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import lombok.Getter; import lombok.Setter; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/IpUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/IpUtils.java similarity index 97% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/IpUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/IpUtils.java index 89c0f46..9d4d7bc 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/IpUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/IpUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.ArrayUtil; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/JsonUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/JsonUtils.java similarity index 86% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/JsonUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/JsonUtils.java index 5bc521a..817b798 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/JsonUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/JsonUtils.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.common.util; - -import com.hccake.ballcat.common.util.json.FastjsonJsonToolAdapter; -import com.hccake.ballcat.common.util.json.GsonJsonToolAdapter; -import com.hccake.ballcat.common.util.json.HuToolJsonToolAdapter; -import com.hccake.ballcat.common.util.json.JacksonJsonToolAdapter; -import com.hccake.ballcat.common.util.json.JsonTool; -import com.hccake.ballcat.common.util.json.TypeReference; +package com.baiye.util; + +import com.baiye.util.json.FastjsonJsonToolAdapter; +import com.baiye.util.json.GsonJsonToolAdapter; +import com.baiye.util.json.HuToolJsonToolAdapter; +import com.baiye.util.json.JacksonJsonToolAdapter; +import com.baiye.util.json.JsonTool; +import com.baiye.util.json.TypeReference; import lombok.Getter; import java.lang.reflect.Type; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/LocalDateTimeUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/LocalDateTimeUtils.java similarity index 98% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/LocalDateTimeUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/LocalDateTimeUtils.java index 51115c9..9d3d209 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/LocalDateTimeUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/LocalDateTimeUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import lombok.experimental.UtilityClass; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SmsUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/SmsUtils.java similarity index 96% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SmsUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/SmsUtils.java index b5288f5..4b88666 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SmsUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/SmsUtils.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; -import com.hccake.ballcat.common.charset.GSMCharset; +import com.baiye.charset.GSMCharset; import java.nio.charset.StandardCharsets; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SpelUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/SpelUtils.java similarity index 98% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SpelUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/SpelUtils.java index ca7bfb7..fb631ea 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SpelUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/SpelUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import org.springframework.context.expression.MethodBasedEvaluationContext; import org.springframework.core.LocalVariableTableParameterNameDiscoverer; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SpringUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/SpringUtils.java similarity index 98% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SpringUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/SpringUtils.java index ec89047..4b79738 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SpringUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/SpringUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import lombok.Setter; import org.springframework.beans.BeansException; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/StreamUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/StreamUtils.java similarity index 98% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/StreamUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/StreamUtils.java index d978c6b..0ffe23b 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/StreamUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/StreamUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SystemUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/SystemUtils.java similarity index 97% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SystemUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/SystemUtils.java index 42db2c9..5bed394 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/SystemUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/SystemUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util; +package com.baiye.util; import lombok.experimental.UtilityClass; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/FastjsonJsonToolAdapter.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/FastjsonJsonToolAdapter.java similarity index 97% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/FastjsonJsonToolAdapter.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/json/FastjsonJsonToolAdapter.java index 02b08bc..1df3b6c 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/FastjsonJsonToolAdapter.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/FastjsonJsonToolAdapter.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util.json; +package com.baiye.util.json; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.parser.Feature; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/GsonJsonToolAdapter.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/GsonJsonToolAdapter.java similarity index 95% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/GsonJsonToolAdapter.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/json/GsonJsonToolAdapter.java index 43d3588..7796968 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/GsonJsonToolAdapter.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/GsonJsonToolAdapter.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util.json; +package com.baiye.util.json; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/HuToolJsonToolAdapter.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/HuToolJsonToolAdapter.java similarity index 95% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/HuToolJsonToolAdapter.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/json/HuToolJsonToolAdapter.java index c8fa70b..34783a5 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/HuToolJsonToolAdapter.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/HuToolJsonToolAdapter.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util.json; +package com.baiye.util.json; import cn.hutool.json.JSONConfig; import cn.hutool.json.JSONUtil; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/JacksonJsonToolAdapter.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/JacksonJsonToolAdapter.java similarity index 97% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/JacksonJsonToolAdapter.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/json/JacksonJsonToolAdapter.java index a31e893..3e3d827 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/JacksonJsonToolAdapter.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/JacksonJsonToolAdapter.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util.json; +package com.baiye.util.json; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/JsonTool.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/JsonTool.java similarity index 93% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/JsonTool.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/json/JsonTool.java index 0ea5851..41fa30b 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/JsonTool.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/JsonTool.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util.json; +package com.baiye.util.json; import java.lang.reflect.Type; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/TypeReference.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/TypeReference.java similarity index 94% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/TypeReference.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/json/TypeReference.java index 36aee03..1f31aa9 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/json/TypeReference.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/json/TypeReference.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util.json; +package com.baiye.util.json; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeNode.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/tree/TreeNode.java similarity index 92% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeNode.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/tree/TreeNode.java index 182c5f2..0292cad 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeNode.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/tree/TreeNode.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util.tree; +package com.baiye.util.tree; import java.util.List; diff --git a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeUtils.java b/ad-distribute-common/common-util/src/main/java/com/baiye/util/tree/TreeUtils.java similarity index 99% rename from ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeUtils.java rename to ad-distribute-common/common-util/src/main/java/com/baiye/util/tree/TreeUtils.java index 5e033d7..50a0d9a 100644 --- a/ad-distribute-common/common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeUtils.java +++ b/ad-distribute-common/common-util/src/main/java/com/baiye/util/tree/TreeUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.util.tree; +package com.baiye.util.tree; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/WebSocketMessageSender.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/WebSocketMessageSender.java similarity index 84% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/WebSocketMessageSender.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/WebSocketMessageSender.java index 9dba019..14830aa 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/WebSocketMessageSender.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/WebSocketMessageSender.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.websocket; +package com.baiye; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import com.baiye.message.JsonWebSocketMessage; +import com.baiye.util.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/AbstractMessageDistributor.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/AbstractMessageDistributor.java similarity index 90% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/AbstractMessageDistributor.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/AbstractMessageDistributor.java index a595fd1..fc444fb 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/AbstractMessageDistributor.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/AbstractMessageDistributor.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.common.websocket.distribute; +package com.baiye.distribute; import cn.hutool.core.collection.CollUtil; -import com.hccake.ballcat.common.websocket.WebSocketMessageSender; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import com.baiye.WebSocketMessageSender; +import com.baiye.session.WebSocketSessionStore; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.WebSocketSession; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/LocalMessageDistributor.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/LocalMessageDistributor.java similarity index 77% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/LocalMessageDistributor.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/LocalMessageDistributor.java index c21a403..67994c3 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/LocalMessageDistributor.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/LocalMessageDistributor.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.websocket.distribute; +package com.baiye.distribute; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import com.baiye.session.WebSocketSessionStore; /** * 本地消息分发，直接进行发送 diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDO.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/MessageDO.java similarity index 91% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDO.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/MessageDO.java index 7488578..634e3db 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDO.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/MessageDO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.distribute; +package com.baiye.distribute; import lombok.Data; import lombok.experimental.Accessors; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDistributor.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/MessageDistributor.java similarity index 79% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDistributor.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/MessageDistributor.java index b615bd0..a5abda6 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDistributor.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/MessageDistributor.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.distribute; +package com.baiye.distribute; /** * 消息分发器 diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageDistributor.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/RedisMessageDistributor.java similarity index 90% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageDistributor.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/RedisMessageDistributor.java index 66c3e2d..1a01869 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageDistributor.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/RedisMessageDistributor.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.websocket.distribute; +package com.baiye.distribute; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import com.baiye.util.JsonUtils; +import com.baiye.session.WebSocketSessionStore; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.connection.MessageListener; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageListenerInitializer.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/RedisMessageListenerInitializer.java similarity index 92% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageListenerInitializer.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/RedisMessageListenerInitializer.java index c1af1cc..8754d8a 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageListenerInitializer.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/RedisMessageListenerInitializer.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.distribute; +package com.baiye.distribute; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.listener.PatternTopic; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RocketmqMessageDistributor.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/RocketmqMessageDistributor.java similarity index 90% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RocketmqMessageDistributor.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/RocketmqMessageDistributor.java index b1a024a..65b5aae 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RocketmqMessageDistributor.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/distribute/RocketmqMessageDistributor.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.common.websocket.distribute; +package com.baiye.distribute; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.ballcat.common.websocket.exception.ErrorJsonMessageException; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import com.baiye.util.JsonUtils; +import com.baiye.exception.ErrorJsonMessageException; +import com.baiye.session.WebSocketSessionStore; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.producer.SendResult; import org.apache.rocketmq.common.message.MessageExt; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/exception/ErrorJsonMessageException.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/exception/ErrorJsonMessageException.java similarity index 78% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/exception/ErrorJsonMessageException.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/exception/ErrorJsonMessageException.java index 3cac83b..b9dcf0f 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/exception/ErrorJsonMessageException.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/exception/ErrorJsonMessageException.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.exception; +package com.baiye.exception; /** * 错误的 json 消息 diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/ConcurrentWebSocketSessionOptions.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/ConcurrentWebSocketSessionOptions.java similarity index 92% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/ConcurrentWebSocketSessionOptions.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/ConcurrentWebSocketSessionOptions.java index 61da289..8a98b0d 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/ConcurrentWebSocketSessionOptions.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/ConcurrentWebSocketSessionOptions.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.handler; +package com.baiye.handler; import lombok.Data; import org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/CustomWebSocketHandler.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/CustomWebSocketHandler.java similarity index 91% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/CustomWebSocketHandler.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/CustomWebSocketHandler.java index eac3cc8..393a4d6 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/CustomWebSocketHandler.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/CustomWebSocketHandler.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.common.websocket.handler; +package com.baiye.handler; +import com.baiye.message.JsonWebSocketMessage; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.json.JsonReadFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.websocket.exception.ErrorJsonMessageException; -import com.hccake.ballcat.common.websocket.holder.JsonMessageHandlerHolder; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import com.baiye.exception.ErrorJsonMessageException; +import com.baiye.holder.JsonMessageHandlerHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/JsonMessageHandler.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/JsonMessageHandler.java similarity index 81% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/JsonMessageHandler.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/JsonMessageHandler.java index 7a61851..ca62e18 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/JsonMessageHandler.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/JsonMessageHandler.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.websocket.handler; +package com.baiye.handler; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import com.baiye.message.JsonWebSocketMessage; import org.springframework.web.socket.WebSocketSession; /** diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PingJsonMessageHandler.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/PingJsonMessageHandler.java similarity index 63% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PingJsonMessageHandler.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/PingJsonMessageHandler.java index f2e582e..741a52e 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PingJsonMessageHandler.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/PingJsonMessageHandler.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.common.websocket.handler; +package com.baiye.handler; -import com.hccake.ballcat.common.websocket.WebSocketMessageSender; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; -import com.hccake.ballcat.common.websocket.message.PingJsonWebSocketMessage; -import com.hccake.ballcat.common.websocket.message.PongJsonWebSocketMessage; -import com.hccake.ballcat.common.websocket.message.WebSocketMessageTypeEnum; +import com.baiye.message.JsonWebSocketMessage; +import com.baiye.message.PingJsonWebSocketMessage; +import com.baiye.message.PongJsonWebSocketMessage; +import com.baiye.message.WebSocketMessageTypeEnum; +import com.baiye.WebSocketMessageSender; import org.springframework.web.socket.WebSocketSession; /** diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PlanTextMessageHandler.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/PlanTextMessageHandler.java similarity index 80% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PlanTextMessageHandler.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/PlanTextMessageHandler.java index c3acf70..3d5f347 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PlanTextMessageHandler.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/handler/PlanTextMessageHandler.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.websocket.handler; +package com.baiye.handler; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import com.baiye.message.JsonWebSocketMessage; import org.springframework.web.socket.WebSocketSession; /** diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerHolder.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/holder/JsonMessageHandlerHolder.java similarity index 76% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerHolder.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/holder/JsonMessageHandlerHolder.java index ec00f3f..26aa82c 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerHolder.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/holder/JsonMessageHandlerHolder.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.websocket.holder; +package com.baiye.holder; -import com.hccake.ballcat.common.websocket.handler.JsonMessageHandler; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import com.baiye.handler.JsonMessageHandler; +import com.baiye.message.JsonWebSocketMessage; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerInitializer.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/holder/JsonMessageHandlerInitializer.java similarity index 78% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerInitializer.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/holder/JsonMessageHandlerInitializer.java index 38eef4b..7b069e1 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerInitializer.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/holder/JsonMessageHandlerInitializer.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.websocket.holder; +package com.baiye.holder; -import com.hccake.ballcat.common.websocket.handler.JsonMessageHandler; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import com.baiye.handler.JsonMessageHandler; +import com.baiye.message.JsonWebSocketMessage; import lombok.RequiredArgsConstructor; import javax.annotation.PostConstruct; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/JsonWebSocketMessage.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/message/JsonWebSocketMessage.java similarity index 91% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/JsonWebSocketMessage.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/message/JsonWebSocketMessage.java index eb30511..51ee647 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/JsonWebSocketMessage.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/message/JsonWebSocketMessage.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.message; +package com.baiye.message; /** *

diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PingJsonWebSocketMessage.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/message/PingJsonWebSocketMessage.java similarity index 80% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PingJsonWebSocketMessage.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/message/PingJsonWebSocketMessage.java index 0a503d3..8d042d4 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PingJsonWebSocketMessage.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/message/PingJsonWebSocketMessage.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.message; +package com.baiye.message; /** * @author Hccake 2021/1/4 diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PongJsonWebSocketMessage.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/message/PongJsonWebSocketMessage.java similarity index 80% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PongJsonWebSocketMessage.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/message/PongJsonWebSocketMessage.java index 5dc36a8..32e9e12 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PongJsonWebSocketMessage.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/message/PongJsonWebSocketMessage.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.message; +package com.baiye.message; /** * @author Hccake 2021/1/4 diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/WebSocketMessageTypeEnum.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/message/WebSocketMessageTypeEnum.java similarity index 82% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/WebSocketMessageTypeEnum.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/message/WebSocketMessageTypeEnum.java index 90a5f6c..135f3e8 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/WebSocketMessageTypeEnum.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/message/WebSocketMessageTypeEnum.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.message; +package com.baiye.message; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/DefaultWebSocketSessionStore.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/session/DefaultWebSocketSessionStore.java similarity index 98% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/DefaultWebSocketSessionStore.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/session/DefaultWebSocketSessionStore.java index 6892d63..0907d81 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/DefaultWebSocketSessionStore.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/session/DefaultWebSocketSessionStore.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.session; +package com.baiye.session; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.WebSocketSession; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/MapSessionWebSocketHandlerDecorator.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/session/MapSessionWebSocketHandlerDecorator.java similarity index 93% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/MapSessionWebSocketHandlerDecorator.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/session/MapSessionWebSocketHandlerDecorator.java index ba29d61..bc1908c 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/MapSessionWebSocketHandlerDecorator.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/session/MapSessionWebSocketHandlerDecorator.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.websocket.session; +package com.baiye.session; -import com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions; +import com.baiye.handler.ConcurrentWebSocketSessionOptions; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketSession; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/SessionKeyGenerator.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/session/SessionKeyGenerator.java similarity index 87% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/SessionKeyGenerator.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/session/SessionKeyGenerator.java index 62e3924..1ac2698 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/SessionKeyGenerator.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/session/SessionKeyGenerator.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.session; +package com.baiye.session; import org.springframework.web.socket.WebSocketSession; diff --git a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/WebSocketSessionStore.java b/ad-distribute-common/common-websocket/src/main/java/com/baiye/session/WebSocketSessionStore.java similarity index 94% rename from ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/WebSocketSessionStore.java rename to ad-distribute-common/common-websocket/src/main/java/com/baiye/session/WebSocketSessionStore.java index ce5866a..7a58381 100644 --- a/ad-distribute-common/common-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/WebSocketSessionStore.java +++ b/ad-distribute-common/common-websocket/src/main/java/com/baiye/session/WebSocketSessionStore.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.websocket.session; +package com.baiye.session; import org.springframework.web.socket.WebSocketSession; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAlias.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAlias.java similarity index 77% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAlias.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAlias.java index a7cf28f..6d879d1 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAlias.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAlias.java @@ -1,6 +1,6 @@ -package com.hccake.extend.mybatis.plus.alias; +package com.baiye.extend.mybatis.plus.alias; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; +import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; import java.lang.annotation.*; /** diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasHelper.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasHelper.java similarity index 97% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasHelper.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasHelper.java index 02112cc..e733e2d 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasHelper.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasHelper.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.alias; +package com.baiye.extend.mybatis.plus.alias; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasNotFoundException.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasNotFoundException.java similarity index 91% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasNotFoundException.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasNotFoundException.java index 1753d08..c5cecd6 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasNotFoundException.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/alias/TableAliasNotFoundException.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.alias; +package com.baiye.extend.mybatis.plus.alias; /** * TableAlias 注解没有找到时抛出的异常 diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/ColumnFunction.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/ColumnFunction.java similarity index 88% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/ColumnFunction.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/ColumnFunction.java index 156e75c..687b483 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/ColumnFunction.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/ColumnFunction.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.conditions.query; +package com.baiye.extend.mybatis.plus.conditions.query; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java similarity index 93% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java index 775826a..dd28cd3 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java @@ -1,9 +1,10 @@ -package com.hccake.extend.mybatis.plus.conditions.query; +package com.baiye.extend.mybatis.plus.conditions.query; +import com.baiye.extend.mybatis.plus.alias.TableAlias; +import com.baiye.extend.mybatis.plus.alias.TableAliasHelper; import com.baomidou.mybatisplus.core.conditions.SharedString; import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.hccake.extend.mybatis.plus.alias.TableAliasHelper; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -13,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; * * @author Hccake 2021/1/14 * @version 1.0 - * @see com.hccake.extend.mybatis.plus.alias.TableAlias + * @see TableAlias */ public class LambdaAliasQueryWrapperX extends LambdaQueryWrapperX { diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java similarity index 99% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java index 4b27321..e6dd104 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.conditions.query; +package com.baiye.extend.mybatis.plus.conditions.query; import com.baomidou.mybatisplus.core.conditions.AbstractLambdaWrapper; import com.baomidou.mybatisplus.core.conditions.SharedString; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/injector/CustomSqlInjector.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/injector/CustomSqlInjector.java similarity index 93% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/injector/CustomSqlInjector.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/injector/CustomSqlInjector.java index 752662c..d4bf1fc 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/injector/CustomSqlInjector.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/injector/CustomSqlInjector.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.injector; +package com.baiye.extend.mybatis.plus.injector; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/mapper/ExtendMapper.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/mapper/ExtendMapper.java similarity index 85% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/mapper/ExtendMapper.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/mapper/ExtendMapper.java index ab490d0..f90eade 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/mapper/ExtendMapper.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/mapper/ExtendMapper.java @@ -1,10 +1,10 @@ -package com.hccake.extend.mybatis.plus.mapper; +package com.baiye.extend.mybatis.plus.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.extend.mybatis.plus.toolkit.PageUtil; +import com.baiye.domain.PageParam; +import com.baiye.extend.mybatis.plus.toolkit.PageUtil; import org.apache.ibatis.annotations.Param; import java.util.Collection; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/BaseInsertBatch.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/BaseInsertBatch.java similarity index 98% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/BaseInsertBatch.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/BaseInsertBatch.java index 9e852a5..71547af 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/BaseInsertBatch.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/BaseInsertBatch.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.methods; +package com.baiye.extend.mybatis.plus.methods; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.injector.AbstractMethod; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java similarity index 98% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java index 6ae9a71..3a990b8 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.methods; +package com.baiye.extend.mybatis.plus.methods; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.enums.SqlMethod; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertIgnoreByBatch.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertIgnoreByBatch.java similarity index 88% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertIgnoreByBatch.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertIgnoreByBatch.java index 51d7f59..7b453af 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertIgnoreByBatch.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertIgnoreByBatch.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.methods; +package com.baiye.extend.mybatis.plus.methods; /** * @author lingting 2020/5/27 11:47 diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java similarity index 97% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java index 62fa784..a9966f0 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.methods; +package com.baiye.extend.mybatis.plus.methods; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java similarity index 96% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java index b97a47e..dc86849 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.methods; +package com.baiye.extend.mybatis.plus.methods; import com.baomidou.mybatisplus.core.metadata.TableInfo; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/ExtendService.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/ExtendService.java similarity index 99% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/ExtendService.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/ExtendService.java index 28ae195..7ec71d8 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/ExtendService.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/ExtendService.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.service; +package com.baiye.extend.mybatis.plus.service; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/impl/ExtendServiceImpl.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/impl/ExtendServiceImpl.java similarity index 98% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/impl/ExtendServiceImpl.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/impl/ExtendServiceImpl.java index f40b97d..dc9aa0f 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/impl/ExtendServiceImpl.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/service/impl/ExtendServiceImpl.java @@ -1,7 +1,9 @@ -package com.hccake.extend.mybatis.plus.service.impl; +package com.baiye.extend.mybatis.plus.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.extend.mybatis.plus.service.ExtendService; import com.baomidou.mybatisplus.core.enums.SqlMethod; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; @@ -11,8 +13,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; -import com.hccake.extend.mybatis.plus.service.ExtendService; import org.apache.ibatis.binding.MapperMethod; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/PageUtil.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/PageUtil.java similarity index 88% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/PageUtil.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/PageUtil.java index 8388352..d887396 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/PageUtil.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/PageUtil.java @@ -1,9 +1,9 @@ -package com.hccake.extend.mybatis.plus.toolkit; +package com.baiye.extend.mybatis.plus.toolkit; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hccake.ballcat.common.model.domain.PageParam; +import com.baiye.domain.PageParam; import java.util.List; diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/WrappersX.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/WrappersX.java similarity index 91% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/WrappersX.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/WrappersX.java index cc19877..dccc877 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/WrappersX.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/toolkit/WrappersX.java @@ -1,8 +1,8 @@ -package com.hccake.extend.mybatis.plus.toolkit; +package com.baiye.extend.mybatis.plus.toolkit; +import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; /** * @author Hccake 2021/1/14 diff --git a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/type/EnumNameTypeHandler.java b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/type/EnumNameTypeHandler.java similarity index 97% rename from ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/type/EnumNameTypeHandler.java rename to ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/type/EnumNameTypeHandler.java index 7cae408..334ac8c 100644 --- a/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/type/EnumNameTypeHandler.java +++ b/ad-distribute-extends/ad-distribute-extend-mybatis-plus/src/main/java/com/baiye/extend/mybatis/plus/type/EnumNameTypeHandler.java @@ -1,4 +1,4 @@ -package com.hccake.extend.mybatis.plus.type; +package com.baiye.extend.mybatis.plus.type; import com.baomidou.mybatisplus.annotation.IEnum; import org.apache.ibatis.type.BaseTypeHandler; diff --git a/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/AbstractOAuth2ResourceOwnerAuthenticationProvider.java b/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/AbstractOAuth2ResourceOwnerAuthenticationProvider.java index e0156b4..0ec6cd2 100644 --- a/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/AbstractOAuth2ResourceOwnerAuthenticationProvider.java +++ b/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/AbstractOAuth2ResourceOwnerAuthenticationProvider.java @@ -1,6 +1,5 @@ package org.ballcat.springsecurity.oauth2.server.authorization.authentication; -import com.hccake.ballcat.common.security.userdetails.ClientPrincipal; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.core.Authentication; diff --git a/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java b/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java index a8180b9..ce2fccc 100644 --- a/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java +++ b/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java @@ -2,12 +2,12 @@ package org.ballcat.springsecurity.oauth2.server.authorization.autoconfigure; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.security.authentication.OAuth2UserAuthenticationToken; -import com.hccake.ballcat.common.security.jackson2.LongMixin; -import com.hccake.ballcat.common.security.jackson2.OAuth2UserAuthenticationTokenMixin; -import com.hccake.ballcat.common.security.jackson2.UserMixin; -import com.hccake.ballcat.common.security.userdetails.User; -import com.hccake.ballcat.common.security.util.PasswordUtils; +import com.baiye.security.authentication.OAuth2UserAuthenticationToken; +import com.baiye.security.jackson2.LongMixin; +import com.baiye.security.jackson2.OAuth2UserAuthenticationTokenMixin; +import com.baiye.security.jackson2.UserMixin; +import com.baiye.security.userdetails.User; +import com.baiye.security.util.PasswordUtils; import lombok.RequiredArgsConstructor; import org.ballcat.springsecurity.oauth2.server.authorization.OAuth2AuthorizationObjectMapperCustomizer; import org.ballcat.springsecurity.oauth2.server.authorization.config.BallcatOAuth2AuthorizationServerSecurityFilterChainBuilder; diff --git a/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java b/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java index 35cafad..7a6e856 100644 --- a/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java +++ b/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java @@ -1,8 +1,8 @@ package org.ballcat.springsecurity.oauth2.server.authorization.token; -import com.hccake.ballcat.common.security.constant.TokenAttributeNameConstants; -import com.hccake.ballcat.common.security.constant.UserInfoFiledNameConstants; -import com.hccake.ballcat.common.security.userdetails.User; +import com.baiye.security.constant.TokenAttributeNameConstants; +import com.baiye.security.constant.UserInfoFiledNameConstants; +import com.baiye.security.userdetails.User; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.server.authorization.authentication.OAuth2ClientAuthenticationToken; import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsContext; diff --git a/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java b/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java index 80d9446..ca1388e 100644 --- a/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java +++ b/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java @@ -1,10 +1,10 @@ package org.ballcat.springsecurity.oauth2.server.authorization.web.filter; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.model.result.SystemResultCode; -import com.hccake.ballcat.common.security.ScopeNames; -import com.hccake.ballcat.common.util.JsonUtils; +import com.baiye.result.R; +import com.baiye.result.SystemResultCode; +import com.baiye.security.ScopeNames; +import com.baiye.util.JsonUtils; import lombok.RequiredArgsConstructor; import org.ballcat.security.captcha.CaptchaValidateResult; import org.ballcat.security.captcha.CaptchaValidator; diff --git a/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java b/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java index 452a0d5..48e3a55 100644 --- a/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java +++ b/ad-distribute-security/security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java @@ -1,11 +1,11 @@ package org.ballcat.springsecurity.oauth2.server.authorization.web.filter; -import com.hccake.ballcat.common.core.request.wrapper.ModifyParamMapRequestWrapper; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.model.result.SystemResultCode; -import com.hccake.ballcat.common.security.ScopeNames; -import com.hccake.ballcat.common.security.util.PasswordUtils; -import com.hccake.ballcat.common.util.JsonUtils; +import com.baiye.request.wrapper.ModifyParamMapRequestWrapper; +import com.baiye.result.R; +import com.baiye.result.SystemResultCode; +import com.baiye.security.ScopeNames; +import com.baiye.security.util.PasswordUtils; +import com.baiye.util.JsonUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/ScopeNames.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/ScopeNames.java similarity index 87% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/ScopeNames.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/ScopeNames.java index 35c0994..509ebe1 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/ScopeNames.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/ScopeNames.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security; +package com.baiye.security; /** * @author hccake diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/authentication/OAuth2UserAuthenticationToken.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/authentication/OAuth2UserAuthenticationToken.java similarity index 94% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/authentication/OAuth2UserAuthenticationToken.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/authentication/OAuth2UserAuthenticationToken.java index 5f76b10..b437770 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/authentication/OAuth2UserAuthenticationToken.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/authentication/OAuth2UserAuthenticationToken.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.authentication; +package com.baiye.security.authentication; import lombok.EqualsAndHashCode; import org.springframework.security.authentication.AbstractAuthenticationToken; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/component/CustomPermissionEvaluator.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/component/CustomPermissionEvaluator.java similarity index 95% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/component/CustomPermissionEvaluator.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/component/CustomPermissionEvaluator.java index 9758730..74f6cae 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/component/CustomPermissionEvaluator.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/component/CustomPermissionEvaluator.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.component; +package com.baiye.security.component; import cn.hutool.core.text.CharSequenceUtil; import lombok.extern.slf4j.Slf4j; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/TokenAttributeNameConstants.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/constant/TokenAttributeNameConstants.java similarity index 87% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/TokenAttributeNameConstants.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/constant/TokenAttributeNameConstants.java index 65a3ae4..4c31caa 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/TokenAttributeNameConstants.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/constant/TokenAttributeNameConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.constant; +package com.baiye.security.constant; /** * @author hccake diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserAttributeNameConstants.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/constant/UserAttributeNameConstants.java similarity index 88% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserAttributeNameConstants.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/constant/UserAttributeNameConstants.java index 137b227..e1dd9e7 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserAttributeNameConstants.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/constant/UserAttributeNameConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.constant; +package com.baiye.security.constant; /** * @author hccake diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserInfoFiledNameConstants.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/constant/UserInfoFiledNameConstants.java similarity index 94% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserInfoFiledNameConstants.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/constant/UserInfoFiledNameConstants.java index e1c8274..adb203c 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserInfoFiledNameConstants.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/constant/UserInfoFiledNameConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.constant; +package com.baiye.security.constant; /** * @author hccake diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/LongMixin.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/LongMixin.java similarity index 87% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/LongMixin.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/LongMixin.java index b4e7539..b370e0d 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/LongMixin.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/LongMixin.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.jackson2; +package com.baiye.security.jackson2; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenDeserializer.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/OAuth2UserAuthenticationTokenDeserializer.java similarity index 91% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenDeserializer.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/OAuth2UserAuthenticationTokenDeserializer.java index d965a26..843c4ba 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenDeserializer.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/OAuth2UserAuthenticationTokenDeserializer.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.jackson2; +package com.baiye.security.jackson2; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.security.authentication.OAuth2UserAuthenticationToken; -import com.hccake.ballcat.common.security.userdetails.User; +import com.baiye.security.authentication.OAuth2UserAuthenticationToken; +import com.baiye.security.userdetails.User; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenMixin.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/OAuth2UserAuthenticationTokenMixin.java similarity index 92% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenMixin.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/OAuth2UserAuthenticationTokenMixin.java index 9533221..5403374 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenMixin.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/OAuth2UserAuthenticationTokenMixin.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.jackson2; +package com.baiye.security.jackson2; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserDeserializer.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/UserDeserializer.java similarity index 96% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserDeserializer.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/UserDeserializer.java index dcf28e3..bb976af 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserDeserializer.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/UserDeserializer.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.jackson2; +package com.baiye.security.jackson2; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.MissingNode; -import com.hccake.ballcat.common.security.userdetails.User; +import com.baiye.security.userdetails.User; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserMixin.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/UserMixin.java similarity index 91% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserMixin.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/UserMixin.java index 75c04ed..11006f1 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserMixin.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/jackson2/UserMixin.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.jackson2; +package com.baiye.security.jackson2; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/ClientPrincipal.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/userdetails/ClientPrincipal.java similarity index 96% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/ClientPrincipal.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/userdetails/ClientPrincipal.java index 266b292..bec4d1c 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/ClientPrincipal.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/userdetails/ClientPrincipal.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.userdetails; +package com.baiye.security.userdetails; import org.springframework.lang.NonNull; import org.springframework.security.core.GrantedAuthority; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/User.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/userdetails/User.java similarity index 97% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/User.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/userdetails/User.java index f60f91b..263da4c 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/User.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/userdetails/User.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.userdetails; +package com.baiye.security.userdetails; import lombok.Builder; import lombok.Getter; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/PasswordUtils.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/util/PasswordUtils.java similarity index 98% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/PasswordUtils.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/util/PasswordUtils.java index 60c3ed7..5f5df96 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/PasswordUtils.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/util/PasswordUtils.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.security.util; +package com.baiye.security.util; import cn.hutool.core.codec.Base64; import cn.hutool.crypto.Mode; diff --git a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/SecurityUtils.java b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/util/SecurityUtils.java similarity index 82% rename from ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/SecurityUtils.java rename to ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/util/SecurityUtils.java index cf10cc2..20aad84 100644 --- a/ad-distribute-security/security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/SecurityUtils.java +++ b/ad-distribute-security/security-oauth2-core/src/main/java/com/baiye/security/util/SecurityUtils.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.security.util; +package com.baiye.security.util; -import com.hccake.ballcat.common.security.userdetails.ClientPrincipal; -import com.hccake.ballcat.common.security.userdetails.User; +import com.baiye.security.userdetails.ClientPrincipal; +import com.baiye.security.userdetails.User; import lombok.experimental.UtilityClass; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -61,4 +61,12 @@ public class SecurityUtils { return null; } + /** + * 获取系统用户ID + * @return 系统用户ID + */ + public Long getCurrentUserId() { + return getUser().getUserId(); + } + } diff --git a/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java b/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java index c343ad6..73d56c7 100644 --- a/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java +++ b/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java @@ -1,6 +1,6 @@ package org.ballcat.springsecurity.oauth2.server.resource; -import com.hccake.ballcat.common.security.component.CustomPermissionEvaluator; +import com.baiye.security.component.CustomPermissionEvaluator; import org.ballcat.springsecurity.oauth2.server.resource.configurer.BallcatOauth2ResourceServerSecurityFilterChainBuilder; import org.ballcat.springsecurity.oauth2.server.resource.configurer.OAuth2ResourceServerConfigurerCustomizer; import org.ballcat.springsecurity.oauth2.server.resource.configurer.OAuth2ResourceServerExtensionConfigurer; @@ -15,7 +15,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java b/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java index 4c77f49..082a1fa 100644 --- a/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java +++ b/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java @@ -1,11 +1,11 @@ package org.ballcat.springsecurity.oauth2.server.resource.introspection; import cn.hutool.core.collection.CollUtil; -import com.hccake.ballcat.common.security.constant.TokenAttributeNameConstants; -import com.hccake.ballcat.common.security.constant.UserAttributeNameConstants; -import com.hccake.ballcat.common.security.constant.UserInfoFiledNameConstants; -import com.hccake.ballcat.common.security.userdetails.ClientPrincipal; -import com.hccake.ballcat.common.security.userdetails.User; +import com.baiye.security.constant.TokenAttributeNameConstants; +import com.baiye.security.constant.UserAttributeNameConstants; +import com.baiye.security.constant.UserInfoFiledNameConstants; +import com.baiye.security.userdetails.ClientPrincipal; +import com.baiye.security.userdetails.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.ParameterizedTypeReference; @@ -36,7 +36,7 @@ import java.util.stream.Stream; /** * copy from {@link SpringOpaqueTokenIntrospector}，重写了 OAuth2AuthenticatedPrincipal - * 的构建，保持项目内统一使用 {@link com.hccake.ballcat.common.security.userdetails.User} + * 的构建，保持项目内统一使用 {@link User} * * A Spring implementation of {@link OpaqueTokenIntrospector} that verifies and * introspects a token using the configured diff --git a/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java b/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java index 1c33699..c625f02 100644 --- a/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java +++ b/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java @@ -1,7 +1,7 @@ package org.ballcat.springsecurity.oauth2.server.resource.introspection; import cn.hutool.core.collection.CollUtil; -import com.hccake.ballcat.common.security.userdetails.ClientPrincipal; +import com.baiye.security.userdetails.ClientPrincipal; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/web/CustomAuthenticationEntryPoint.java b/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/web/CustomAuthenticationEntryPoint.java index 5662dc1..6da2184 100644 --- a/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/web/CustomAuthenticationEntryPoint.java +++ b/ad-distribute-security/security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/web/CustomAuthenticationEntryPoint.java @@ -1,8 +1,8 @@ package org.ballcat.springsecurity.oauth2.server.resource.web; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.model.result.SystemResultCode; -import com.hccake.ballcat.common.util.JsonUtils; +import com.baiye.result.R; +import com.baiye.result.SystemResultCode; +import com.baiye.util.JsonUtils; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.security.core.AuthenticationException; diff --git a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/FileAutoConfiguration.java b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/FileAutoConfiguration.java similarity index 73% rename from ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/FileAutoConfiguration.java rename to ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/FileAutoConfiguration.java index 265fc43..32b615f 100644 --- a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/FileAutoConfiguration.java +++ b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/FileAutoConfiguration.java @@ -1,9 +1,8 @@ -package com.hccake.starter.file; +package com.baiye.starter.file; -import com.hccake.starter.file.FileProperties.LocalProperties; -import com.hccake.starter.file.core.FileClient; -import com.hccake.starter.file.ftp.FtpFileClient; -import com.hccake.starter.file.local.LocalFileClient; +import com.baiye.starter.file.ftp.FtpFileClient; +import com.baiye.starter.file.core.FileClient; +import com.baiye.starter.file.local.LocalFileClient; import lombok.AllArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -32,8 +31,8 @@ public class FileAutoConfiguration { @Bean @ConditionalOnMissingBean(FileClient.class) public FileClient ballcatFileLocalClient(FileProperties properties) throws IOException { - LocalProperties localProperties = properties == null || properties.getLocal() == null ? new LocalProperties() - : properties.getLocal(); + FileProperties.LocalProperties localProperties = properties == null || properties.getLocal() == null + ? new FileProperties.LocalProperties() : properties.getLocal(); return new LocalFileClient(localProperties); } diff --git a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/FileProperties.java b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/FileProperties.java similarity index 93% rename from ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/FileProperties.java rename to ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/FileProperties.java index 9e31d59..d878839 100644 --- a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/FileProperties.java +++ b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/FileProperties.java @@ -1,6 +1,6 @@ -package com.hccake.starter.file; +package com.baiye.starter.file; -import com.hccake.starter.file.ftp.FtpMode; +import com.baiye.starter.file.ftp.FtpMode; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/core/AbstractFileClient.java b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/core/AbstractFileClient.java similarity index 93% rename from ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/core/AbstractFileClient.java rename to ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/core/AbstractFileClient.java index f59a1b4..63c92eb 100644 --- a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/core/AbstractFileClient.java +++ b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/core/AbstractFileClient.java @@ -1,4 +1,4 @@ -package com.hccake.starter.file.core; +package com.baiye.starter.file.core; /** * @author 疯狂的狮子Li 2022-04-24 diff --git a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/core/FileClient.java b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/core/FileClient.java similarity index 95% rename from ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/core/FileClient.java rename to ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/core/FileClient.java index 74fa334..1d249d2 100644 --- a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/core/FileClient.java +++ b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/core/FileClient.java @@ -1,4 +1,4 @@ -package com.hccake.starter.file.core; +package com.baiye.starter.file.core; import java.io.File; import java.io.IOException; diff --git a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/exception/FileException.java b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/exception/FileException.java similarity index 90% rename from ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/exception/FileException.java rename to ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/exception/FileException.java index f8ea18a..684a1ef 100644 --- a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/exception/FileException.java +++ b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/exception/FileException.java @@ -1,4 +1,4 @@ -package com.hccake.starter.file.exception; +package com.baiye.starter.file.exception; import java.io.IOException; diff --git a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpFileClient.java b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/ftp/FtpFileClient.java similarity index 91% rename from ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpFileClient.java rename to ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/ftp/FtpFileClient.java index 279b87d..581f17a 100644 --- a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpFileClient.java +++ b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/ftp/FtpFileClient.java @@ -1,12 +1,12 @@ -package com.hccake.starter.file.ftp; +package com.baiye.starter.file.ftp; import cn.hutool.core.io.FileUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.extra.ftp.Ftp; import cn.hutool.extra.ftp.FtpConfig; -import com.hccake.starter.file.FileProperties.FtpProperties; -import com.hccake.starter.file.core.AbstractFileClient; -import com.hccake.starter.file.exception.FileException; +import com.baiye.starter.file.FileProperties; +import com.baiye.starter.file.core.AbstractFileClient; +import com.baiye.starter.file.exception.FileException; import org.springframework.util.StringUtils; import java.io.File; @@ -23,7 +23,7 @@ public class FtpFileClient extends AbstractFileClient { private final Ftp client; - public FtpFileClient(FtpProperties properties) { + public FtpFileClient(FileProperties.FtpProperties properties) { FtpConfig config = new FtpConfig().setHost(properties.getIp()) .setPort(properties.getPort()) .setUser(properties.getUsername()) diff --git a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpMode.java b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/ftp/FtpMode.java similarity index 86% rename from ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpMode.java rename to ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/ftp/FtpMode.java index ca1e696..4978bfa 100644 --- a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpMode.java +++ b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/ftp/FtpMode.java @@ -1,4 +1,4 @@ -package com.hccake.starter.file.ftp; +package com.baiye.starter.file.ftp; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/local/LocalFileClient.java b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/local/LocalFileClient.java similarity index 86% rename from ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/local/LocalFileClient.java rename to ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/local/LocalFileClient.java index b32087b..abc02c3 100644 --- a/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/hccake/starter/file/local/LocalFileClient.java +++ b/ad-distribute-starters/ad-distribute-starter-file/src/main/java/com/baiye/starter/file/local/LocalFileClient.java @@ -1,10 +1,10 @@ -package com.hccake.starter.file.local; +package com.baiye.starter.file.local; import cn.hutool.core.io.FileUtil; -import com.hccake.ballcat.common.util.StreamUtils; -import com.hccake.starter.file.FileProperties.LocalProperties; -import com.hccake.starter.file.core.AbstractFileClient; -import com.hccake.starter.file.exception.FileException; +import com.baiye.starter.file.FileProperties; +import com.baiye.starter.file.core.AbstractFileClient; +import com.baiye.starter.file.exception.FileException; +import com.baiye.util.StreamUtils; import org.springframework.util.StringUtils; import java.io.File; @@ -20,7 +20,7 @@ public class LocalFileClient extends AbstractFileClient { private final File parentDir; - public LocalFileClient(LocalProperties properties) throws IOException { + public LocalFileClient(FileProperties.LocalProperties properties) throws IOException { final File dir = StringUtils.hasText(properties.getPath()) ? new File(properties.getPath()) : FileUtil.getTmpDir(); // 不存在且创建失败 diff --git a/ad-distribute-starters/ad-distribute-starter-file/src/main/resources/META-INF/spring.factories b/ad-distribute-starters/ad-distribute-starter-file/src/main/resources/META-INF/spring.factories index 13f98c7..dcae179 100644 --- a/ad-distribute-starters/ad-distribute-starter-file/src/main/resources/META-INF/spring.factories +++ b/ad-distribute-starters/ad-distribute-starter-file/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.starter.file.FileAutoConfiguration \ No newline at end of file + com.baiye.starter.file.FileAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-starters/ad-distribute-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ad-distribute-starters/ad-distribute-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4557439..e972ea0 100644 --- a/ad-distribute-starters/ad-distribute-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ad-distribute-starters/ad-distribute-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.starter.file.FileAutoConfiguration \ No newline at end of file +com.baiye.starter.file.FileAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-starters/ad-distribute-starter-oss/pom.xml b/ad-distribute-starters/ad-distribute-starter-oss/pom.xml deleted file mode 100644 index 28d5f4e..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - ad-distribute-starters - com.baiye - 1.1.0 - - 4.0.0 - ad-distribute-starter-oss - - - true - - - - - org.springframework.boot - spring-boot-autoconfigure - - - org.springframework.boot - spring-boot-configuration-processor - true - - - software.amazon.awssdk - s3 - - - software.amazon.awssdk - s3-transfer-manager - - - diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/DefaultOssTemplate.java b/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/DefaultOssTemplate.java deleted file mode 100644 index 2cc053d..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/DefaultOssTemplate.java +++ /dev/null @@ -1,309 +0,0 @@ -package com.hccake.ballcat.common.oss; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; -import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; -import software.amazon.awssdk.auth.credentials.AwsCredentials; -import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; -import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.awscore.exception.AwsServiceException; -import software.amazon.awssdk.core.exception.SdkClientException; -import software.amazon.awssdk.core.sync.RequestBody; -import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.s3.S3AsyncClient; -import software.amazon.awssdk.services.s3.S3Client; -import software.amazon.awssdk.services.s3.S3Configuration; -import software.amazon.awssdk.services.s3.model.*; -import software.amazon.awssdk.services.s3.presigner.S3Presigner; -import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest; -import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest; -import software.amazon.awssdk.transfer.s3.S3TransferManager; -import software.amazon.awssdk.transfer.s3.model.FileUpload; -import software.amazon.awssdk.transfer.s3.model.Upload; -import software.amazon.awssdk.transfer.s3.model.UploadFileRequest; -import software.amazon.awssdk.transfer.s3.model.UploadRequest; - -import javax.activation.MimetypesFileTypeMap; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.net.URL; -import java.time.Duration; -import java.util.List; - -/** - * OSS操作模板 - *

- * 低级API实现 - *

- *

- * 兼容1.x com.amazonaws.services.s3.AbstractAmazonS3部分API - *

- * - * @author lishangbu - * @date 2022/10/22 - */ -@RequiredArgsConstructor -public class DefaultOssTemplate implements InitializingBean, DisposableBean, OssTemplate { - - /** - * 对象存储服务配置 - */ - @Getter - protected final OssProperties ossProperties; - - /** - * S3客户端 - */ - @Getter - protected S3Client s3Client; - - /** - * S3预签名工具 - */ - @Getter - protected S3Presigner s3Presigner; - - /** - * aws凭证管理器 - */ - @Getter - protected AwsCredentialsProvider awsCredentialsProvider; - - @Getter - protected S3TransferManager s3TransferManager; - - // region 存储桶相关操作 - - /** - * 删除存储桶 - * @param deleteBucketRequest 删除存储桶请求 - * @return 文件服务器返回的删除存储桶的响应结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 删除存储桶 - */ - @Override - public DeleteBucketResponse deleteBucket(DeleteBucketRequest deleteBucketRequest) { - return s3Client.deleteBucket(deleteBucketRequest); - } - - /** - * 删除存储桶 - * @param bucket 待删除的存储桶名称 - * @return 文件服务器返回的删除存储桶的响应结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 删除存储桶 - */ - @Override - public DeleteBucketResponse deleteBucket(String bucket) { - return deleteBucket(DeleteBucketRequest.builder().bucket(bucket).build()); - } - - // endregion - - // region 对象相关操作 - - /** - * 根据文件前缀查询对象列表 - * @param prefix 对象前缀 - * @return 对象列表 - * @see 罗列对象 - */ - @Override - public List listObjects(String prefix) { - return listObjects(ossProperties.getBucket(), prefix); - } - - /** - * 根据文件前缀查询对象列表 - * @param bucket 存储桶名称 - * @param prefix 对象前缀 - * @return 对象列表 - * @see 罗列对象 - */ - @Override - public List listObjects(String bucket, String prefix) { - return listObjects(bucket, prefix, 1000); - } - - /** - * 根据文件前缀查询对象列表 - * @param bucket 存储桶名称 - * @param prefix 对象前缀 - * @param maxKeys 设置在响应中返回的键的最大数量。默认情况下，该操作最多返回1,000个键名。响应可能包含更少的键，但永远不会包含更多 - * @return 对象列表 - * @see 罗列对象 - */ - @Override - public List listObjects(String bucket, String prefix, Integer maxKeys) { - return s3Client.listObjects(ListObjectsRequest.builder().maxKeys(maxKeys).prefix(prefix).bucket(bucket).build()) - .contents(); - } - - /** - * 上传文件 - * @param bucket bucket名称 - * @param key 文件名称 - * @param file 文件 - * @return 文件服务器针对上传对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @throws IOException IO异常 - * @see 往存储桶中添加对象 - */ - @Override - public PutObjectResponse putObject(String bucket, String key, File file) - throws AwsServiceException, SdkClientException, S3Exception, IOException { - return s3Client.putObject(PutObjectRequest.builder() - .bucket(bucket) - .key(key) - .contentLength(file.length()) - .contentType(MimetypesFileTypeMap.getDefaultFileTypeMap().getContentType(file)) - .build(), RequestBody.fromFile(file)); - } - - /** - * 删除对象 - * @param deleteObjectRequest 通用删除对象请求 - * @return 文件服务器针对删除对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 从存储桶中删除对象 - */ - @Override - public DeleteObjectResponse deleteObject(DeleteObjectRequest deleteObjectRequest) { - return s3Client.deleteObject(deleteObjectRequest); - } - - /** - * 删除对象 - * @param key 对象键 - * @return 文件服务器针对删除对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 从存储桶中删除对象 - */ - @Override - public DeleteObjectResponse deleteObject(String key) { - return deleteObject(ossProperties.getBucket(), key); - } - - /** - * 删除对象 - * @param bucket 存储桶 - * @param key 对象键,支持静默全局前缀键操作 - * @return 文件服务器针对删除对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 从存储桶中删除对象 - */ - @Override - public DeleteObjectResponse deleteObject(String bucket, String key) { - return deleteObject(DeleteObjectRequest.builder().bucket(bucket).key(key).build()); - } - - @Override - public FileUpload uploadFile(UploadFileRequest uploadFileRequest) { - return this.s3TransferManager.uploadFile(uploadFileRequest); - } - - @Override - public Upload upload(UploadRequest uploadRequest) { - return this.s3TransferManager.upload(uploadRequest); - } - - /** - * 获取文件外链 - * @param bucket bucket名称 - * @param key 文件名称 - * @param duration 过期时间 - * @return url的文本表示 - * @see 获取文件外链 - */ - @Override - public String getObjectPresignedUrl(String bucket, String key, Duration duration) { - - GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(bucket).key(key).build(); - - GetObjectPresignRequest getObjectPresignRequest = GetObjectPresignRequest.builder() - .signatureDuration(duration) - .getObjectRequest(getObjectRequest) - .build(); - - PresignedGetObjectRequest presignedGetObjectRequest = s3Presigner.presignGetObject(getObjectPresignRequest); - URL url = presignedGetObjectRequest.url(); - return url.toString(); - } - - // endregion - - @Override - public void afterPropertiesSet() throws Exception { - - // 构造S3客户端 - AwsCredentials awsCredentials = AwsBasicCredentials.create(ossProperties.getAccessKey(), - ossProperties.getAccessSecret()); - this.awsCredentialsProvider = StaticCredentialsProvider.create(awsCredentials); - - this.s3Client = S3Client.builder() - .credentialsProvider(awsCredentialsProvider) - .region(Region.of(ossProperties.getRegion())) - .serviceConfiguration(S3Configuration.builder() - .pathStyleAccessEnabled(ossProperties.getPathStyleAccess()) - .chunkedEncodingEnabled(ossProperties.getChunkedEncoding()) - .build()) - .endpointOverride(URI.create(ossProperties.getEndpoint())) - .build(); - - // 构建预签名工具 - this.s3Presigner = S3Presigner.builder() - .serviceConfiguration( - S3Configuration.builder().pathStyleAccessEnabled(ossProperties.getPathStyleAccess()).build()) - .region(Region.of(ossProperties.getRegion())) - .endpointOverride(URI.create(ossProperties.getEndpoint())) - .credentialsProvider(awsCredentialsProvider) - .build(); - // 构建S3高级传输工具 - this.s3TransferManager = S3TransferManager.builder() - .s3Client(S3AsyncClient.builder() - .credentialsProvider(getAwsCredentialsProvider()) - .region(Region.of(getOssProperties().getRegion())) - .endpointOverride(URI.create(getOssProperties().getEndpoint())) - .build()) - .build(); - } - - @Override - public void destroy() throws Exception { - if (this.s3Client != null) { - this.s3Client.close(); - } - if (this.s3Presigner != null) { - this.s3Presigner.close(); - } - if (this.s3TransferManager != null) { - this.s3TransferManager.close(); - } - } - -} diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/ObjectWithGlobalKeyPrefixOssTemplate.java b/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/ObjectWithGlobalKeyPrefixOssTemplate.java deleted file mode 100644 index 86c09d6..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/ObjectWithGlobalKeyPrefixOssTemplate.java +++ /dev/null @@ -1,240 +0,0 @@ -package com.hccake.ballcat.common.oss; - -import com.hccake.ballcat.common.oss.prefix.ObjectKeyPrefixConverter; -import lombok.Getter; -import org.springframework.util.StringUtils; -import software.amazon.awssdk.awscore.exception.AwsServiceException; -import software.amazon.awssdk.core.exception.SdkClientException; -import software.amazon.awssdk.core.sync.RequestBody; -import software.amazon.awssdk.services.s3.model.*; -import software.amazon.awssdk.transfer.s3.model.FileUpload; - -import java.io.File; -import java.io.IOException; -import java.time.Duration; -import java.util.List; -import java.util.stream.Collectors; - -/** - * OSS操作模板[对象key带全局前缀] - * - * @author lishangbu 2022/10/23 - */ -public class ObjectWithGlobalKeyPrefixOssTemplate extends DefaultOssTemplate { - - /** - * 对象key前缀转换器 - */ - @Getter - private final ObjectKeyPrefixConverter objectKeyPrefixConverter; - - /** - * 构造器 - * @param ossProperties OSS属性配置文件 - * @param objectKeyPrefixConverter 对象全局键前缀转换器 - */ - public ObjectWithGlobalKeyPrefixOssTemplate(OssProperties ossProperties, - ObjectKeyPrefixConverter objectKeyPrefixConverter) { - super(ossProperties); - this.objectKeyPrefixConverter = objectKeyPrefixConverter; - } - - @Override - public List listObjects(String bucket, String prefix, Integer maxKeys) { - // 构造API_ListObjects请求 - List contents = s3Client - .listObjects(ListObjectsRequest.builder() - .bucket(bucket) - .maxKeys(maxKeys) - .prefix(objectKeyPrefixConverter.wrap(prefix)) - .build()) - .contents(); - return objectKeyPrefixConverter.match() ? contents.stream() - .map(ele -> S3Object.builder() - .checksumAlgorithm(ele.checksumAlgorithm()) - .checksumAlgorithmWithStrings(ele.checksumAlgorithmAsStrings()) - .eTag(ele.eTag()) - .lastModified(ele.lastModified()) - .key(objectKeyPrefixConverter.unwrap(ele.key())) - .owner(ele.owner()) - .size(ele.size()) - .storageClass(ele.storageClass()) - .build()) - .collect(Collectors.toList()) : contents; - } - - /** - * 上传文件 - * @param bucket bucket名称 - * @param key 文件名称 - * @param file 文件 - * @return 文件服务器针对上传对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @throws IOException IO异常 - * @see 往存储桶中添加对象 - */ - @Override - public PutObjectResponse putObject(String bucket, String key, File file) - throws AwsServiceException, SdkClientException, S3Exception, IOException { - return super.putObject(bucket, objectKeyPrefixConverter.wrap(key), file); - } - - /** - * 上传文件 - * @param putObjectRequest PutObjectRequest - * @param requestBody RequestBody - * @return 文件服务器针对上传对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 往存储桶中添加对象 - */ - @Override - public PutObjectResponse putObject(PutObjectRequest putObjectRequest, RequestBody requestBody) - throws AwsServiceException, SdkClientException, S3Exception { - if (StringUtils.hasText(putObjectRequest.key())) { - return super.putObject(PutObjectRequest.builder() - .acl(putObjectRequest.acl()) - .contentType(putObjectRequest.contentType()) - .key(objectKeyPrefixConverter.wrap(putObjectRequest.key())) - .bucket(putObjectRequest.bucket()) - .contentLength(putObjectRequest.contentLength()) - .cacheControl(putObjectRequest.cacheControl()) - .metadata(putObjectRequest.metadata()) - .checksumAlgorithm(putObjectRequest.checksumAlgorithm()) - .checksumCRC32(putObjectRequest.checksumCRC32()) - .checksumCRC32C(putObjectRequest.checksumCRC32C()) - .checksumSHA1(putObjectRequest.checksumSHA1()) - .checksumSHA256(putObjectRequest.checksumSHA256()) - .bucketKeyEnabled(putObjectRequest.bucketKeyEnabled()) - .contentEncoding(putObjectRequest.contentEncoding()) - .contentMD5(putObjectRequest.contentMD5()) - .websiteRedirectLocation(putObjectRequest.websiteRedirectLocation()) - .expectedBucketOwner(putObjectRequest.expectedBucketOwner()) - .expires(putObjectRequest.expires()) - .grantFullControl(putObjectRequest.grantFullControl()) - .grantRead(putObjectRequest.grantRead()) - .grantReadACP(putObjectRequest.grantReadACP()) - .grantWriteACP(putObjectRequest.grantWriteACP()) - .contentLanguage(putObjectRequest.contentLanguage()) - .objectLockMode(putObjectRequest.objectLockMode()) - .objectLockLegalHoldStatus(putObjectRequest.objectLockLegalHoldStatus()) - .objectLockRetainUntilDate(putObjectRequest.objectLockRetainUntilDate()) - .overrideConfiguration(putObjectRequest.overrideConfiguration().orElse(null)) - .requestPayer(putObjectRequest.requestPayer()) - .serverSideEncryption(putObjectRequest.serverSideEncryption()) - .sseCustomerAlgorithm(putObjectRequest.sseCustomerAlgorithm()) - .sseCustomerKey(putObjectRequest.sseCustomerKey()) - .sseCustomerKeyMD5(putObjectRequest.sseCustomerKeyMD5()) - .ssekmsEncryptionContext(putObjectRequest.ssekmsEncryptionContext()) - .ssekmsKeyId(putObjectRequest.ssekmsKeyId()) - .contentDisposition(putObjectRequest.contentDisposition()) - .tagging(putObjectRequest.tagging()) - .build(), requestBody); - } - return super.putObject(putObjectRequest, requestBody); - } - - /** - * 删除对象 - * @param bucket 存储桶 - * @param key 对象键,支持静默全局前缀键操作 - * @return 文件服务器针对删除对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 从存储桶中删除对象 - */ - @Override - public DeleteObjectResponse deleteObject(String bucket, String key) { - return super.deleteObject(bucket, objectKeyPrefixConverter.wrap(key)); - } - - /** - * 删除对象 - * @param deleteObjectRequest 通用删除对象请求,如果包含key，则对key进行包装 - * @return 文件服务器针对删除对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 从存储桶中删除对象 - */ - @Override - public DeleteObjectResponse deleteObject(DeleteObjectRequest deleteObjectRequest) { - - if (StringUtils.hasText(deleteObjectRequest.key())) { - return super.deleteObject(DeleteObjectRequest.builder() - .bucket(deleteObjectRequest.bucket()) - .key(objectKeyPrefixConverter.wrap(deleteObjectRequest.key())) - .bypassGovernanceRetention(deleteObjectRequest.bypassGovernanceRetention()) - .expectedBucketOwner(deleteObjectRequest.expectedBucketOwner()) - .mfa(deleteObjectRequest.mfa()) - .overrideConfiguration(deleteObjectRequest.overrideConfiguration().orElse(null)) - .requestPayer(deleteObjectRequest.requestPayer()) - .versionId(deleteObjectRequest.versionId()) - .build()); - } - else { - return super.deleteObject(deleteObjectRequest); - } - } - - /** - * 获取文件URL,需保证有访问权限 - * @param bucket bucket名称 - * @param key 文件名称 - * @return url - */ - @Override - public String getURL(String bucket, String key) { - return super.getURL(bucket, objectKeyPrefixConverter.wrap(key)); - } - - /** - * 获取文件外链 - * @param bucket bucket名称 - * @param key 文件名称 - * @param duration 过期时间 - * @return url的文本表示 - * @see 获取文件外链 - */ - @Override - public String getObjectPresignedUrl(String bucket, String key, Duration duration) { - return super.getObjectPresignedUrl(bucket, objectKeyPrefixConverter.wrap(key), duration); - } - - /** - * Schedules a new transfer to upload data to Amazon S3. This method is non-blocking - * and returns immediately (i.e. before the upload has finished). - *

- * The returned Upload object allows you to query the progress of the transfer, add - * listeners for progress events, and wait for the upload to complete. - *

- * If resources are available, the upload will begin immediately, otherwise it will be - * scheduled and started as soon as resources become available. - *

- * If you are uploading AWS KMS-encrypted - * objects, you need to specify the correct region of the bucket on your client and - * configure AWS Signature Version 4 for added security. For more information on how - * to do this, see http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html# - * specify-signature-version - *

- * @param bucket The name of the bucket to upload the new object to. - * @param key The key in the specified bucket by which to store the new object. - * @param file The file to upload. - * @return A new Upload object which can be used to check state of the upload, listen - * for progress notifications, and otherwise manage the upload. - */ - @Override - public FileUpload uploadFile(String bucket, String key, File file) { - return super.uploadFile(bucket, objectKeyPrefixConverter.wrap(key), file); - } - -} diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssAutoConfiguration.java b/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssAutoConfiguration.java deleted file mode 100644 index 9e5a45e..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssAutoConfiguration.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hccake.ballcat.common.oss; - -import com.hccake.ballcat.common.oss.prefix.DefaultObjectKeyPrefixConverter; -import com.hccake.ballcat.common.oss.prefix.ObjectKeyPrefixConverter; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; - -/** - * oss 自动配置类 - * - * @author Hccake - */ -@AutoConfiguration -@EnableConfigurationProperties(OssProperties.class) -@ConditionalOnProperty(prefix = OssProperties.PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true) -public class OssAutoConfiguration { - - /** - * OSS操作模板，单纯用来兼容老版本实现 - * @param properties 属性配置 - * @param objectKeyPrefixConverter S3对象全局键前缀转换器 - * @return OssTemplate - */ - @Bean - @ConditionalOnMissingBean(OssTemplate.class) - public OssTemplate ossTemplate(OssProperties properties, ObjectKeyPrefixConverter objectKeyPrefixConverter) { - if (objectKeyPrefixConverter.match()) { - return new ObjectWithGlobalKeyPrefixOssTemplate(properties, objectKeyPrefixConverter); - } - else { - return new DefaultOssTemplate(properties); - } - } - - /** - * S3属性配置 - * @param properties OSS属性配置文件 - * @return S3对象全局键前缀转换器 - */ - @Bean - @ConditionalOnMissingBean(ObjectKeyPrefixConverter.class) - public ObjectKeyPrefixConverter objectPrefixConverter(OssProperties properties) { - return new DefaultObjectKeyPrefixConverter(properties); - } - - /** - * OSS客户端，单纯用来兼容老版本实现 - * @param ossTemplate oss操作模板 - * @param objectKeyPrefixConverter S3对象全局键前缀转换器 - * @return OssClient - */ - @Bean - @ConditionalOnMissingBean(OssClient.class) - public OssClient ossClient(OssTemplate ossTemplate, ObjectKeyPrefixConverter objectKeyPrefixConverter) { - return new OssClient(ossTemplate, objectKeyPrefixConverter); - } - -} diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssClient.java b/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssClient.java deleted file mode 100644 index edb871f..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssClient.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.hccake.ballcat.common.oss; - -import com.hccake.ballcat.common.oss.prefix.ObjectKeyPrefixConverter; -import lombok.RequiredArgsConstructor; -import software.amazon.awssdk.core.sync.RequestBody; -import software.amazon.awssdk.services.s3.model.ObjectCannedACL; -import software.amazon.awssdk.services.s3.model.PutObjectRequest; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; - -/** - * @author lingting 2021/5/11 9:59 - */ -@Deprecated -@RequiredArgsConstructor -public class OssClient { - - private final OssTemplate ossTemplate; - - private final ObjectKeyPrefixConverter objectKeyPrefixConverter; - - public boolean isEnable() { - return ossTemplate.getOssProperties().getEnabled(); - } - - /** - * 通过流上传文件 - *

注意: 本方法不会主动关闭流. 请手动关闭传入的流

- * @param stream 流 - * @param relativeKey 相对key - * @param size 流大小 - * @return java.lang.String - */ - public String upload(InputStream stream, String relativeKey, Long size) { - return upload(stream, relativeKey, size, null); - } - - /** - * 通过文件对象上传文件 - * @param file 文件 - * @param relativeKey 相对key - * @return java.lang.String - * @throws IOException 流操作时异常 - */ - public String upload(File file, String relativeKey) throws IOException { - try (final FileInputStream stream = new FileInputStream(file)) { - return upload(stream, relativeKey, Files.size(file.toPath()), null); - } - } - - /** - * 通过流上传文件 - *

注意: 本方法不会主动关闭流. 请手动关闭传入的流

- * @param stream 流 - * @param relativeKey 相对key,会自动尝试包装全局前缀 - * @param size 流大小 - * @param acl 文件权限 - * @return java.lang.String - */ - public String upload(InputStream stream, String relativeKey, Long size, ObjectCannedACL acl) { - final String objectKey = objectKeyPrefixConverter.wrap(relativeKey); - final PutObjectRequest.Builder builder = PutObjectRequest.builder() - .bucket(ossTemplate.getOssProperties().getBucket()) - .key(objectKey); - - if (acl != null) { - // 配置权限 - builder.acl(acl); - } - - ossTemplate.putObject(builder.build(), RequestBody.fromInputStream(stream, size)); - return objectKey; - } - - /** - * 获取 相对路径 的下载url - */ - public String getDownloadUrl(String relativeKey) { - return getDownloadUrlByAbsolute(objectKeyPrefixConverter.wrap(relativeKey)); - } - - /** - * 获取 绝对路径 的下载url - */ - public String getDownloadUrlByAbsolute(String objectKey) { - return String.format("%s/%s", ossTemplate.getOssProperties().getEndpoint(), objectKey); - } - -} diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssConstants.java b/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssConstants.java deleted file mode 100644 index 03f0332..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssConstants.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hccake.ballcat.common.oss; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -/** - * @author lingting 2021/5/10 15:54 - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class OssConstants { - - public static final String SLASH = "/"; - -} diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssProperties.java b/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssProperties.java deleted file mode 100644 index f06ee70..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssProperties.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.hccake.ballcat.common.oss; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import software.amazon.awssdk.regions.Region; - -/** - * @author Hccake - * @version 1.0 - * @date 2019/7/16 15:34 - */ - -@Data -@ConfigurationProperties(prefix = OssProperties.PREFIX) -public class OssProperties { - - public static final String PREFIX = "ballcat.oss"; - - /** - * 是否开启OSS - */ - private Boolean enabled = true; - - /** - * - *

- * endpoint 节点地址, 例如: - *

- *
    - *
  • 阿里云节点: oss-cn-qingdao.aliyuncs.com
    • - *
  • 亚马逊s3节点: s3.ap-southeast-1.amazonaws.com
    • - *
  • 亚马逊节点: ap-southeast-1.amazonaws.com
    • - *
- *

- * 只需要完整 正确的节点地址即可 - *

- *

- * 如果使用 自定义的域名转发 不需要配置本值 - *

- */ - private String endpoint; - - /** - *

- * 区域 - *

- * - *

- * 如果配置了自定义域名(domain), 必须配置本值 - *

- *

- * 如果没有配置自定义域名(domain), 配置了节点, 那么当前值可以不配置 - *

- */ - private String region = Region.CN_NORTH_1.id(); - - /** - * 密钥key - */ - private String accessKey; - - /** - * 密钥Secret - */ - private String accessSecret; - - /** - * - * 默认存储桶 - * - */ - private String bucket; - - /** - * 所有 oss 对象 key 的前缀 - */ - private String objectKeyPrefix; - - /** - *

- * S3支持virtual-hosted style URL和path style URL两种访问bucket的方式 - *

- *
  • - *
      - * Path style URL:在path style URL中，bucket的名子紧跟在domain之后，成为URL path的一部分 - * 形如:http://s3endpoint/BUCKET - *

      - * 例如，如果你要把photo.jpg存放在region为us-west-2，bucket为images的bucket中，你可用以下的方式来访问这个文件： - *

      - *

      - * http://s3-us-west-2.amazonaws.com/images/photo.jpg - *

      - * - *

      - * http://s3.us-west-2.amazonaws.com/images/photo.jpg - *

      - *

      - * 如果，这个bucket在us-east-1这个region中，你可以使用如下方式： - *

      - *

      - * http://s3.amazonaws.com/images/photo.jpg - * - *

      - *

      - * http://s3-external-1.amazonaws.com/images/photo.jpg - *

      - *

      - * 此值为true时,默认开启此风格。可用于nginx 反向代理和S3默认支持 - *

      - *
    - *
      - * Virtual-hosted style URL:在virtual-hosted style - * URL中，bucket的名称成为了subdomain:http://BUCKET.s3endpoint - *

      - * 例如，如果你要把photo.jpg存放在region为us-west-2，bucket为images的bucket中，你可用以下的方式来访问这个文件： - *

      - *

      - * http://images.s3-us-west-2.amazonaws.com/photo.jpg - *

      - *

      - * http://images.s3.us-west-2.amazonaws.com/photo.jpg - *

      - *

      - * 如果，这个bucket在us-east-1这个region中，你可以使用如下方式： - *

      - *

      - * http://images.s3.amazonaws.com/photo.jpg - *

      - *

      - * http://images.s3-external-1.amazonaws.com/photo.jpg - *

      - *

      - * 此值为false时,默认开启此风格。可用于阿里云等 - *

      - *
    - *
    • - * - */ - private Boolean pathStyleAccess = true; - - /** - * 是否将数据进行分块传输 aliyun 不支持分块传输 - */ - private Boolean chunkedEncoding = true; - -} diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssTemplate.java b/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssTemplate.java deleted file mode 100644 index 7c4e626..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssTemplate.java +++ /dev/null @@ -1,521 +0,0 @@ -package com.hccake.ballcat.common.oss; - -import org.springframework.lang.NonNull; -import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; -import software.amazon.awssdk.awscore.exception.AwsServiceException; -import software.amazon.awssdk.core.async.AsyncRequestBody; -import software.amazon.awssdk.core.exception.SdkClientException; -import software.amazon.awssdk.core.sync.RequestBody; -import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.s3.S3Client; -import software.amazon.awssdk.services.s3.model.*; -import software.amazon.awssdk.services.s3.presigner.S3Presigner; -import software.amazon.awssdk.transfer.s3.S3TransferManager; -import software.amazon.awssdk.transfer.s3.model.FileUpload; -import software.amazon.awssdk.transfer.s3.model.Upload; -import software.amazon.awssdk.transfer.s3.model.UploadFileRequest; -import software.amazon.awssdk.transfer.s3.model.UploadRequest; - -import java.io.File; -import java.io.IOException; -import java.time.Duration; -import java.util.List; -import java.util.function.Consumer; - -/** - * OSS操作 - * - * @author lishangbu - * @date 2022/10/28 - */ -public interface OssTemplate { - - /** - * 获取OSS属性配置 - * @return OSS属性配置 - */ - @NonNull - OssProperties getOssProperties(); - - /** - * 获取S3客户端 - * @return - */ - @NonNull - S3Client getS3Client(); - - /** - * 获取AWS凭证管理器 - * @return - */ - @NonNull - AwsCredentialsProvider getAwsCredentialsProvider(); - - /** - * 获取S3预签名工具 - * @return - */ - @NonNull - S3Presigner getS3Presigner(); - - /** - * 获取S3传输管理器 - * @return - */ - @NonNull - S3TransferManager getS3TransferManager(); - - // region 存储桶相关操作 - - /** - * 创建bucket - * @param createBucketRequest 通用创建bucket请求 - * @return 文件服务器返回的创建存储桶的响应结果 - * @throws BucketAlreadyExistsException 请求的存储桶名称不可用。存储桶名称空间由系统的所有用户共享。请选择其他名称然后重试。 - * @throws BucketAlreadyOwnedByYouException 您尝试创建的存储桶已经存在，并且您拥有它。 Amazon - * S3在除北弗吉尼亚州以外的所有AWS地区均返回此错误。为了实现旧兼容性，如果您重新创建在北弗吉尼亚州已经拥有的现有存储桶， Amazon S3将返回200 - * OK并重置存储桶访问控制列表（ACL） - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 创建存储桶 - */ - default CreateBucketResponse createBucket(CreateBucketRequest createBucketRequest) - throws BucketAlreadyExistsException, BucketAlreadyOwnedByYouException, AwsServiceException, - SdkClientException, S3Exception { - return getS3Client().createBucket(createBucketRequest); - } - - /** - * 创建bucket - * @param bucket 存储桶名称 - * @return 文件服务器返回的创建存储桶的响应结果 - * @throws BucketAlreadyExistsException 请求的存储桶名称不可用。存储桶名称空间由系统的所有用户共享。请选择其他名称然后重试。 - * @throws BucketAlreadyOwnedByYouException 您尝试创建的存储桶已经存在，并且您拥有它。 Amazon - * S3在除北弗吉尼亚州以外的所有AWS地区均返回此错误。为了实现旧兼容性，如果您重新创建在北弗吉尼亚州已经拥有的现有存储桶， Amazon S3将返回200 - * OK并重置存储桶访问控制列表（ACL） - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 创建存储桶 - */ - default CreateBucketResponse createBucket(String bucket) throws BucketAlreadyExistsException, - BucketAlreadyOwnedByYouException, AwsServiceException, SdkClientException, S3Exception { - return createBucket(CreateBucketRequest.builder().bucket(bucket).build()); - } - - /** - * 创建bucket - * @param bucket 存储桶名称 - * @return 文件服务器返回的创建存储桶的响应结果 - * @throws BucketAlreadyExistsException 请求的存储桶名称不可用。存储桶名称空间由系统的所有用户共享。请选择其他名称然后重试。 - * @throws BucketAlreadyOwnedByYouException 您尝试创建的存储桶已经存在，并且您拥有它。 Amazon - * S3在除北弗吉尼亚州以外的所有AWS地区均返回此错误。为了实现旧兼容性，如果您重新创建在北弗吉尼亚州已经拥有的现有存储桶， Amazon S3将返回200 - * OK并重置存储桶访问控制列表（ACL） - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 创建存储桶 - */ - default CreateBucketResponse createBucket(String bucket, Region region) throws BucketAlreadyExistsException, - BucketAlreadyOwnedByYouException, AwsServiceException, SdkClientException, S3Exception { - return createBucket(bucket, region.id()); - } - - /** - * 创建bucket - * @param bucket 存储桶名称 - * @param region 区域 - * @return 文件服务器返回的创建存储桶的响应结果 - * @throws BucketAlreadyExistsException 请求的存储桶名称不可用。存储桶名称空间由系统的所有用户共享。请选择其他名称然后重试。 - * @throws BucketAlreadyOwnedByYouException 您尝试创建的存储桶已经存在，并且您拥有它。 Amazon - * S3在除北弗吉尼亚州以外的所有AWS地区均返回此错误。为了实现旧兼容性，如果您重新创建在北弗吉尼亚州已经拥有的现有存储桶， Amazon S3将返回200 - * OK并重置存储桶访问控制列表（ACL） - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 创建存储桶 - */ - default CreateBucketResponse createBucket(String bucket, String region) throws BucketAlreadyExistsException, - BucketAlreadyOwnedByYouException, AwsServiceException, SdkClientException, S3Exception { - return createBucket(CreateBucketRequest.builder() - .createBucketConfiguration(CreateBucketConfiguration.builder().locationConstraint(region).build()) - .bucket(bucket) - .build()); - } - - /** - * @param listBucketsRequest 罗列存储桶请求 获取当前认证用户持有的全部存储桶信息列表 - * @return 当前认证用户持有的获取全部存储桶信息列表 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * - * @see 罗列存储桶 - */ - default ListBucketsResponse listBuckets(ListBucketsRequest listBucketsRequest) - throws AwsServiceException, SdkClientException, S3Exception { - return getS3Client().listBuckets(listBucketsRequest); - } - - /** - * 获取当前认证用户持有的全部存储桶信息列表 - * @return 当前认证用户持有的获取全部存储桶信息列表 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * - * @see 罗列存储桶 - */ - default ListBucketsResponse listBuckets() throws AwsServiceException, SdkClientException, S3Exception { - return getS3Client().listBuckets(); - } - - /** - * 删除存储桶 - * @param deleteBucketRequest 删除存储桶请求 - * @return 文件服务器返回的删除存储桶的响应结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 删除存储桶 - */ - default DeleteBucketResponse deleteBucket(DeleteBucketRequest deleteBucketRequest) { - return getS3Client().deleteBucket(deleteBucketRequest); - } - - /** - * 删除存储桶 - * @param bucket 待删除的存储桶名称 - * @return 文件服务器返回的删除存储桶的响应结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 删除存储桶 - */ - default DeleteBucketResponse deleteBucket(String bucket) { - return deleteBucket(DeleteBucketRequest.builder().bucket(bucket).build()); - } - - // endregion - - // region 对象相关操作 - - /** - * 根据文件前缀查询对象列表 - * @param prefix 对象前缀 - * @return 对象列表 - * @see 罗列对象 - */ - default List listObjects(String prefix) { - return listObjects(getOssProperties().getBucket(), prefix); - } - - /** - * 根据文件前缀查询对象列表 - * @param bucket 存储桶名称 - * @param prefix 对象前缀 - * @return 对象列表 - * @see 罗列对象 - */ - default List listObjects(String bucket, String prefix) { - return listObjects(bucket, prefix, 1000); - } - - /** - * 根据文件前缀查询对象列表 - * @param bucket 存储桶名称 - * @param prefix 对象前缀 - * @param maxKeys 设置在响应中返回的键的最大数量。默认情况下，该操作最多返回1,000个键名。响应可能包含更少的键，但永远不会包含更多 - * @return 对象列表 - * @see 罗列对象 - */ - List listObjects(String bucket, String prefix, Integer maxKeys); - - /** - * 上传文件 - * @param bucket bucket名称 - * @param key 文件名称 - * @param file 文件 - * @return 文件服务器针对上传对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @throws IOException IO异常 - * @see 往存储桶中添加对象 - */ - PutObjectResponse putObject(String bucket, String key, File file) - throws AwsServiceException, SdkClientException, S3Exception, IOException; - - /** - * 上传文件 - * @param putObjectRequest - * @param requestBody - * @return 文件服务器针对上传对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 往存储桶中添加对象 - */ - default PutObjectResponse putObject(PutObjectRequest putObjectRequest, RequestBody requestBody) - throws AwsServiceException, SdkClientException, S3Exception { - return getS3Client().putObject(putObjectRequest, requestBody); - } - - /** - * 删除对象 - * @param deleteObjectRequest 通用删除对象请求 - * @return 文件服务器针对删除对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 从存储桶中删除对象 - */ - default DeleteObjectResponse deleteObject(DeleteObjectRequest deleteObjectRequest) { - return getS3Client().deleteObject(deleteObjectRequest); - } - - /** - * 删除对象 - * @param key 对象键 - * @return 文件服务器针对删除对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 从存储桶中删除对象 - */ - default DeleteObjectResponse deleteObject(String key) { - return deleteObject(getOssProperties().getBucket(), key); - } - - /** - * 删除对象 - * @param bucket 存储桶 - * @param key 对象键,支持静默全局前缀键操作 - * @return 文件服务器针对删除对象操作的返回结果 - * @throws AwsServiceException SDK可能引发的所有异常的基类（不论是服务端异常还是客户端异常）。可用于所有场景下的异常捕获。 - * @throws SdkClientException 如果发生任何客户端错误，例如与IO相关的异常，无法获取凭据等,会抛出此异常 - * @throws S3Exception 所有服务端异常的基类。未知异常将作为此类型的实例抛出 - * @see 从存储桶中删除对象 - */ - default DeleteObjectResponse deleteObject(String bucket, String key) { - return getS3Client().deleteObject(DeleteObjectRequest.builder().bucket(bucket).key(key).build()); - } - - /** - * 获取文件URL,需保证有访问权限 - * @param bucket bucket名称 - * @param key 文件名称 - * @return url - */ - default String getURL(String bucket, String key) { - return getS3Client().utilities().getUrl(GetUrlRequest.builder().key(key).bucket(bucket).build()).toString(); - } - - /** - * 获取文件URL,需保证有访问权限 - * @param key 文件名称 - * @return url - */ - default String getURL(String key) { - return getURL(getOssProperties().getBucket(), key); - } - - /** - * 获取文件外链 - * @param bucket bucket名称 - * @param key 文件名称 - * @param duration 过期时间 - * @return url的文本表示 - * @see 获取文件外链 - */ - String getObjectPresignedUrl(String bucket, String key, Duration duration); - - /** - * 获取文件外链,默认2小时后过期 - * @param bucket bucket名称 - * @param keyName 文件名称 - * @return url的文本表示 - * @see 获取文件外链 - */ - default String getObjectPresignedUrl(String bucket, String keyName) { - return getObjectPresignedUrl(bucket, keyName, Duration.ofHours(2)); - } - - /** - * 获取文件外链,默认2小时后过期 - * @param keyName 文件名称 - * @return url的文本表示 - * @see 获取文件外链 - */ - default String getObjectPresignedUrl(String keyName) { - return getObjectPresignedUrl(getOssProperties().getBucket(), keyName, Duration.ofHours(2)); - } - - // endregion - - // region 用于上传的高级API - - /** - * Schedules a new transfer to upload data to Amazon S3. This method is non-blocking - * and returns immediately (i.e. before the upload has finished). - *

    - * The returned Upload object allows you to query the progress of the transfer, add - * listeners for progress events, and wait for the upload to complete. - *

    - * If resources are available, the upload will begin immediately, otherwise it will be - * scheduled and started as soon as resources become available. - *

    - * If you are uploading AWS KMS-encrypted - * objects, you need to specify the correct region of the bucket on your client and - * configure AWS Signature Version 4 for added security. For more information on how - * to do this, see http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html# - * specify-signature-version - *

    - * @param bucket The name of the bucket to upload the new object to. - * @param key The key in the specified bucket by which to store the new object. - * @param file The file to upload. - * @return A new Upload object which can be used to check state of the upload, listen - * for progress notifications, and otherwise manage the upload. - */ - default FileUpload uploadFile(String bucket, String key, File file) { - return getS3TransferManager().uploadFile(UploadFileRequest.builder() - .putObjectRequest(PutObjectRequest.builder().bucket(bucket).key(key).build()) - .source(file) - .build()); - } - - /** - * Schedules a new transfer to upload data to Amazon S3. This method is non-blocking - * and returns immediately (i.e. before the upload has finished). - *

    - * The returned Upload object allows you to query the progress of the transfer, add - * listeners for progress events, and wait for the upload to complete. - *

    - * If resources are available, the upload will begin immediately, otherwise it will be - * scheduled and started as soon as resources become available. - *

    - * If you are uploading AWS KMS-encrypted - * objects, you need to specify the correct region of the bucket on your client and - * configure AWS Signature Version 4 for added security. For more information on how - * to do this, see http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html# - * specify-signature-version - *

    - * @param key The key in the specified bucket by which to store the new object. - * @param file The file to upload. - * @return A new Upload object which can be used to check state of the upload, listen - * for progress notifications, and otherwise manage the upload. - */ - default FileUpload uploadFile(String key, File file) { - return uploadFile(getOssProperties().getBucket(), key, file); - } - - /** - * Schedules a new transfer to upload data to Amazon S3. This method is non-blocking - * and returns immediately (i.e. before the upload has finished). - *

    - * The returned Upload object allows you to query the progress of the transfer, add - * listeners for progress events, and wait for the upload to complete. - *

    - * If resources are available, the upload will begin immediately, otherwise it will be - * scheduled and started as soon as resources become available. - *

    - * If you are uploading AWS KMS-encrypted - * objects, you need to specify the correct region of the bucket on your client and - * configure AWS Signature Version 4 for added security. For more information on how - * to do this, see http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html# - * specify-signature-version - *

    - * @param file The file to upload. - * @return A new Upload object which can be used to check state of the upload, listen - * for progress notifications, and otherwise manage the upload. - */ - default FileUpload uploadFile(File file) { - return uploadFile(getOssProperties().getBucket(), file.getName(), file); - } - - /** - * 上传一个本地文件到S3中的对象。对于非基于文件的上传，您可以使用 {@link #upload(UploadRequest)} 替代. - *

    - * 使用示例: 

    -	 * {@code
-	 * FileUpload upload =
-	 *     tm.uploadFile(u -> u.source(Paths.get("myFile.txt"))
-	 *                         .putObjectRequest(p -> p.bucket("bucket").key("key")));
-	 * // 等待传输完成
-	 * upload.completionFuture().join();
-	 * }
-	 *
    - * - * @see #uploadFile(Consumer) - * @see #upload(UploadRequest) - */ - FileUpload uploadFile(UploadFileRequest uploadFileRequest); - - /** - * 这是一个简便的方法用于创建一个 {@link UploadFileRequest} 的构建器, 避免了手动创建 - * {@link UploadFileRequest#builder()}. - * - * @see #uploadFile(UploadFileRequest) - */ - default FileUpload uploadFile(Consumer request) { - return uploadFile(UploadFileRequest.builder().applyMutation(request).build()); - } - - /** - * Upload the given {@link AsyncRequestBody} to an object in S3. For file-based - * uploads, you may use {@link #uploadFile(UploadFileRequest)} instead. - *

    - * Usage Example: 

    -	 * {@code
-	 * Upload upload =
-	 *     tm.upload(u -> u.requestBody(AsyncRequestBody.fromString("Hello world"))
-	 *                     .putObjectRequest(p -> p.bucket("bucket").key("key")));
-	 * // Wait for the transfer to complete
-	 * upload.completionFuture().join();
-	 * }
-	 *
    See the static factory methods available in {@link AsyncRequestBody} for - * other use cases. - * @param uploadRequest the upload request, containing a {@link PutObjectRequest} and - * {@link AsyncRequestBody} - * @return An {@link Upload} that can be used to track the ongoing transfer - * @see #upload(Consumer) - * @see #uploadFile(UploadFileRequest) - */ - default Upload upload(UploadRequest uploadRequest) { - return getS3TransferManager().upload(uploadRequest); - } - - /** - * This is a convenience method that creates an instance of the {@link UploadRequest} - * builder, avoiding the need to create one manually via - * {@link UploadRequest#builder()}. - * - * @see #upload(UploadRequest) - */ - default Upload upload(Consumer request) { - return upload(UploadRequest.builder().applyMutation(request).build()); - } - - // endregion - -} diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/DefaultObjectKeyPrefixConverter.java b/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/DefaultObjectKeyPrefixConverter.java deleted file mode 100644 index bda2a36..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/DefaultObjectKeyPrefixConverter.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.hccake.ballcat.common.oss.prefix; - -import com.hccake.ballcat.common.oss.OssConstants; -import com.hccake.ballcat.common.oss.OssProperties; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; - -/** - * 默认对象前缀处理器 - * - * @author lishangbu - * @date 2022/10/23 - */ -@Slf4j -@RequiredArgsConstructor -public class DefaultObjectKeyPrefixConverter implements ObjectKeyPrefixConverter, InitializingBean { - - /** - * OSS属性配置 - */ - private final OssProperties properties; - - /** - * 全局对象前缀 - */ - private String globalObjectPrefix; - - @Override - public String getPrefix() { - return properties.getObjectKeyPrefix(); - } - - /** - * 判断是否匹配该前缀处理器 当objectKeyPrefix配置非法时,globalObjectPrefix可能不会生效 - * @return true 匹配 false不匹配 - */ - @Override - public boolean match() { - return StringUtils.hasText(getPrefix()) && StringUtils.hasText(this.globalObjectPrefix); - } - - @Override - public String unwrap(String key) { - return match() && key.startsWith(this.globalObjectPrefix) ? key.substring(this.globalObjectPrefix.length()) - : key; - } - - @Override - public String wrap(String key) { - return match() ? this.globalObjectPrefix + key : key; - } - - /** - * 输出当前的路径标准化对象前缀信息 参考官方文档使用前缀组织对象 - * @throws Exception 如果配置错误(例如设置基本属性失败)，或者初始化由于其他原因失败则抛出异常 - */ - @Override - public void afterPropertiesSet() throws Exception { - String configPrefix = getPrefix(); - if (ObjectUtils.isEmpty(configPrefix)) { - log.info("未配置全局前缀配置,全局前缀组织对象功能不启用"); - return; - } - if (OssConstants.SLASH.equals(configPrefix)) { - log.warn("全局前缀路径为非法配置:[{}],全局路径不起效,全局前缀组织对象功能不启用", OssConstants.SLASH); - return; - } - - this.globalObjectPrefix = configPrefix; - // 保证 全局前缀路径 不以 / 开头 - if (this.globalObjectPrefix.startsWith(OssConstants.SLASH)) { - this.globalObjectPrefix = this.globalObjectPrefix.substring(1); - } - - // 保证 全局前缀路径 以 / 结尾 - if (!this.globalObjectPrefix.endsWith(OssConstants.SLASH)) { - this.globalObjectPrefix = this.globalObjectPrefix + OssConstants.SLASH; - } - - if (log.isInfoEnabled()) { - log.info("全局前缀组织对象功能启用，全局前缀配置路径为:[{}],标准化前缀全局前缀路径为:[{}]", configPrefix, this.globalObjectPrefix); - log.info("存在全局前缀时，针对用户操作OSS对象(上传、删除)的部分会自动拼接全局前缀，针对用户读取OSS对象的部分，返回的OSS对象会自动移除全局前缀,但实际存储在OSS的位置也会包含全局路径"); - log.info("例如,存在`abc`桶时，全局前缀设置为`d`时,上传OSS对象`e.txt`时,OSS对象会按照`d/e.txt`保存，用户在具有权限时可通过资源`{}/abc/d/e.txt`访问该资源", - properties.getEndpoint()); - log.info("用户试图查找该资源时，只需要传入`e.txt`,插件会自动发起对`d/e.txt`路径的查询,返回的OSS对象也会去除查询到的对象名称将为`e.txt`"); - log.info("用户试图删除该资源时，只需要传入`e.txt`,插件会自动发起对`d/e.txt`路径对象的删除"); - } - } - -} diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/ObjectKeyPrefixConverter.java b/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/ObjectKeyPrefixConverter.java deleted file mode 100644 index 3732c11..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/ObjectKeyPrefixConverter.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hccake.ballcat.common.oss.prefix; - -/** - * 存储对象 key前缀生成器 - * - * @author lishangbu - * @date 2022/10/23 - */ -public interface ObjectKeyPrefixConverter { - - /** - * 生成前缀 - * @return 前缀 - */ - String getPrefix(); - - /** - * 前置匹配，是否走添加前缀规则 - * @return 是否匹配 - */ - boolean match(); - - /** - * 去除key前缀 - * @param key key字节数组 - * @return 原始key - */ - String unwrap(String key); - - /** - * 给key加上固定前缀 - * @param key 原始key字节数组 - * @return 加前缀之后的key - */ - String wrap(String key); - -} diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/resources/META-INF/spring.factories b/ad-distribute-starters/ad-distribute-starter-oss/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 954d42a..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.common.oss.OssAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ad-distribute-starters/ad-distribute-starter-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 0d2c9ab..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.hccake.ballcat.common.oss.OssAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/test/resources/application-minio.yml b/ad-distribute-starters/ad-distribute-starter-oss/src/test/resources/application-minio.yml deleted file mode 100644 index ebe5723..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/test/resources/application-minio.yml +++ /dev/null @@ -1,10 +0,0 @@ -ballcat: - # OSS - oss: - endpoint: http://127.0.0.1:9000 - access-key: fileserver - access-secret: fileserver - bucket: test - path-style-access: false - region: xxx - #object-key-prefix: pic \ No newline at end of file diff --git a/ad-distribute-starters/ad-distribute-starter-oss/src/test/resources/test.txt b/ad-distribute-starters/ad-distribute-starter-oss/src/test/resources/test.txt deleted file mode 100644 index b565616..0000000 --- a/ad-distribute-starters/ad-distribute-starter-oss/src/test/resources/test.txt +++ /dev/null @@ -1 +0,0 @@ -Hello,World! diff --git a/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java b/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java similarity index 86% rename from ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java rename to ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java index 898ce7a..a7d0ab1 100644 --- a/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java +++ b/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.autoconfigure.redis; +package com.baiye.ballcat.autoconfigure.redis; -import com.hccake.ballcat.common.redis.listener.MessageEventListener; +import com.baiye.listener.MessageEventListener; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.listener.RedisMessageListenerContainer; diff --git a/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java b/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java similarity index 83% rename from ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java rename to ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java index e0c5e96..568f93d 100644 --- a/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java +++ b/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java @@ -1,16 +1,16 @@ -package com.hccake.ballcat.autoconfigure.redis; +package com.baiye.ballcat.autoconfigure.redis; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.redis.RedisHelper; -import com.hccake.ballcat.common.redis.config.CacheProperties; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; -import com.hccake.ballcat.common.redis.core.CacheStringAspect; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; -import com.hccake.ballcat.common.redis.prefix.impl.DefaultRedisPrefixConverter; -import com.hccake.ballcat.common.redis.serialize.CacheSerializer; -import com.hccake.ballcat.common.redis.serialize.JacksonSerializer; -import com.hccake.ballcat.common.redis.serialize.PrefixJdkRedisSerializer; -import com.hccake.ballcat.common.redis.serialize.PrefixStringRedisSerializer; +import com.baiye.RedisHelper; +import com.baiye.upms.config.CacheProperties; +import com.baiye.upms.config.CachePropertiesHolder; +import com.baiye.core.CacheStringAspect; +import com.baiye.prefix.IRedisPrefixConverter; +import com.baiye.prefix.impl.DefaultRedisPrefixConverter; +import com.baiye.serialize.CacheSerializer; +import com.baiye.serialize.JacksonSerializer; +import com.baiye.serialize.PrefixJdkRedisSerializer; +import com.baiye.serialize.PrefixStringRedisSerializer; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java b/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java similarity index 90% rename from ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java rename to ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java index dce9c5a..dc27a62 100644 --- a/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java +++ b/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.autoconfigure.redis; +package com.baiye.ballcat.autoconfigure.redis; -import com.hccake.ballcat.common.redis.listener.MessageEventListener; +import com.baiye.listener.MessageEventListener; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java b/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java similarity index 91% rename from ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java rename to ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java index 4e70814..31208e2 100644 --- a/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java +++ b/ad-distribute-starters/ad-distribute-starter-redis/src/main/java/com/baiye/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.autoconfigure.redis; +package com.baiye.ballcat.autoconfigure.redis; -import com.hccake.ballcat.common.redis.config.CacheProperties; -import com.hccake.ballcat.common.redis.keyevent.listener.*; -import com.hccake.ballcat.common.redis.keyevent.template.KeyDeletedEventMessageTemplate; -import com.hccake.ballcat.common.redis.keyevent.template.KeyExpiredEventMessageTemplate; -import com.hccake.ballcat.common.redis.keyevent.template.KeySetEventMessageTemplate; +import com.baiye.upms.config.CacheProperties; +import com.baiye.keyevent.listener.*; +import com.baiye.keyevent.template.KeyDeletedEventMessageTemplate; +import com.baiye.keyevent.template.KeyExpiredEventMessageTemplate; +import com.baiye.keyevent.template.KeySetEventMessageTemplate; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/ad-distribute-starters/ad-distribute-starter-redis/src/main/resources/META-INF/spring.factories b/ad-distribute-starters/ad-distribute-starter-redis/src/main/resources/META-INF/spring.factories index ad8188a..9c1c8c6 100644 --- a/ad-distribute-starters/ad-distribute-starter-redis/src/main/resources/META-INF/spring.factories +++ b/ad-distribute-starters/ad-distribute-starter-redis/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.autoconfigure.redis.BallcatRedisAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.redis.MessageEventListenerAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.redis.RedisKeyEventAutoConfiguration \ No newline at end of file + com.baiye.ballcat.autoconfigure.redis.BallcatRedisAutoConfiguration,\ + com.baiye.ballcat.autoconfigure.redis.MessageEventListenerAutoConfiguration,\ + com.baiye.ballcat.autoconfigure.redis.RedisKeyEventAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-starters/ad-distribute-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ad-distribute-starters/ad-distribute-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 3816f5e..2850be1 100644 --- a/ad-distribute-starters/ad-distribute-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ad-distribute-starters/ad-distribute-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,3 @@ -com.hccake.ballcat.autoconfigure.redis.BallcatRedisAutoConfiguration -com.hccake.ballcat.autoconfigure.redis.MessageEventListenerAutoConfiguration -com.hccake.ballcat.autoconfigure.redis.RedisKeyEventAutoConfiguration \ No newline at end of file +BallcatRedisAutoConfiguration +MessageEventListenerAutoConfiguration +RedisKeyEventAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SpringfoxHandlerProviderBeanPostProcessor.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SpringfoxHandlerProviderBeanPostProcessor.java similarity index 97% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SpringfoxHandlerProviderBeanPostProcessor.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SpringfoxHandlerProviderBeanPostProcessor.java index 57170aa..809c921 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SpringfoxHandlerProviderBeanPostProcessor.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SpringfoxHandlerProviderBeanPostProcessor.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.swagger; +package com.baiye.swagger; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerAggregatorAutoConfiguration.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerAggregatorAutoConfiguration.java similarity index 90% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerAggregatorAutoConfiguration.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerAggregatorAutoConfiguration.java index 4019db8..aec1733 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerAggregatorAutoConfiguration.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerAggregatorAutoConfiguration.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.swagger; +package com.baiye.swagger; -import com.hccake.ballcat.common.swagger.property.SwaggerAggregatorProperties; -import com.hccake.ballcat.common.swagger.property.SwaggerProperties; +import com.baiye.swagger.property.SwaggerAggregatorProperties; +import com.baiye.swagger.property.SwaggerProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerConfiguration.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerConfiguration.java similarity index 86% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerConfiguration.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerConfiguration.java index 4403d4a..64820d0 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerConfiguration.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerConfiguration.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.common.swagger; +package com.baiye.swagger; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.ballcat.common.swagger.builder.DocketBuildHelper; -import com.hccake.ballcat.common.swagger.builder.MultiRequestHandlerSelectors; -import com.hccake.ballcat.common.swagger.property.SwaggerProperties; +import com.baiye.swagger.builder.DocketBuildHelper; +import com.baiye.swagger.builder.MultiRequestHandlerSelectors; +import com.baiye.swagger.property.SwaggerProperties; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java similarity index 95% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java index 76f6999..bba2507 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.swagger; +package com.baiye.swagger; -import com.hccake.ballcat.common.swagger.property.SwaggerProperties; +import com.baiye.swagger.property.SwaggerProperties; import org.springframework.boot.SpringApplication; import org.springframework.boot.env.EnvironmentPostProcessor; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerProviderAutoConfiguration.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerProviderAutoConfiguration.java similarity index 91% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerProviderAutoConfiguration.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerProviderAutoConfiguration.java index 9a11dd7..24ef3a5 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/SwaggerProviderAutoConfiguration.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/SwaggerProviderAutoConfiguration.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.swagger; +package com.baiye.swagger; -import com.hccake.ballcat.common.swagger.property.SwaggerProperties; -import com.hccake.ballcat.common.swagger.property.SwaggerProviderProperties; +import com.baiye.swagger.property.SwaggerProperties; +import com.baiye.swagger.property.SwaggerProviderProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/annotation/EnableSwagger2Aggregator.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/annotation/EnableSwagger2Aggregator.java similarity index 74% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/annotation/EnableSwagger2Aggregator.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/annotation/EnableSwagger2Aggregator.java index b61c604..e791a4b 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/annotation/EnableSwagger2Aggregator.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/annotation/EnableSwagger2Aggregator.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.swagger.annotation; +package com.baiye.swagger.annotation; -import com.hccake.ballcat.common.swagger.SwaggerAggregatorAutoConfiguration; +import com.baiye.swagger.SwaggerAggregatorAutoConfiguration; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/annotation/EnableSwagger2Provider.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/annotation/EnableSwagger2Provider.java similarity index 74% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/annotation/EnableSwagger2Provider.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/annotation/EnableSwagger2Provider.java index d4218be..cf2897f 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/annotation/EnableSwagger2Provider.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/annotation/EnableSwagger2Provider.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.common.swagger.annotation; +package com.baiye.swagger.annotation; -import com.hccake.ballcat.common.swagger.SwaggerProviderAutoConfiguration; +import com.baiye.swagger.SwaggerProviderAutoConfiguration; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/builder/DocketBuildHelper.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/builder/DocketBuildHelper.java similarity index 95% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/builder/DocketBuildHelper.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/builder/DocketBuildHelper.java index a545f87..713cd59 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/builder/DocketBuildHelper.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/builder/DocketBuildHelper.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.common.swagger.builder; +package com.baiye.swagger.builder; -import com.hccake.ballcat.common.swagger.constant.SwaggerConstants; -import com.hccake.ballcat.common.swagger.property.SwaggerProperties; +import com.baiye.swagger.constant.SwaggerConstants; +import com.baiye.swagger.property.SwaggerProperties; import lombok.RequiredArgsConstructor; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/builder/MultiRequestHandlerSelectors.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/builder/MultiRequestHandlerSelectors.java similarity index 98% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/builder/MultiRequestHandlerSelectors.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/builder/MultiRequestHandlerSelectors.java index 19c85a9..63338bf 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/builder/MultiRequestHandlerSelectors.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/builder/MultiRequestHandlerSelectors.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.swagger.builder; +package com.baiye.swagger.builder; import org.springframework.util.ClassUtils; import springfox.documentation.RequestHandler; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/constant/SwaggerConstants.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/constant/SwaggerConstants.java similarity index 90% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/constant/SwaggerConstants.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/constant/SwaggerConstants.java index f96f43f..3cb7973 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/constant/SwaggerConstants.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/constant/SwaggerConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.swagger.constant; +package com.baiye.swagger.constant; import java.util.Arrays; import java.util.List; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/DocumentationTypeEnum.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/DocumentationTypeEnum.java similarity index 89% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/DocumentationTypeEnum.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/DocumentationTypeEnum.java index 8d6e87a..871edc5 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/DocumentationTypeEnum.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/DocumentationTypeEnum.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.swagger.property; +package com.baiye.swagger.property; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/SwaggerAggregatorProperties.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/SwaggerAggregatorProperties.java similarity index 90% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/SwaggerAggregatorProperties.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/SwaggerAggregatorProperties.java index 0bb458b..9a530ae 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/SwaggerAggregatorProperties.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/SwaggerAggregatorProperties.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.swagger.property; +package com.baiye.swagger.property; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/SwaggerProperties.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/SwaggerProperties.java similarity index 97% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/SwaggerProperties.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/SwaggerProperties.java index 0fa99f1..85c251c 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/SwaggerProperties.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/SwaggerProperties.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.swagger.property; +package com.baiye.swagger.property; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/SwaggerProviderProperties.java b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/SwaggerProviderProperties.java similarity index 87% rename from ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/SwaggerProviderProperties.java rename to ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/SwaggerProviderProperties.java index a7b56e7..e6de880 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/hccake/ballcat/common/swagger/property/SwaggerProviderProperties.java +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/java/com/baiye/swagger/property/SwaggerProviderProperties.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.common.swagger.property; +package com.baiye.swagger.property; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/resources/META-INF/spring.factories b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/resources/META-INF/spring.factories index 04375db..e4eeb52 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/resources/META-INF/spring.factories +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # Environment Post Processor org.springframework.boot.env.EnvironmentPostProcessor=\ -com.hccake.ballcat.common.swagger.SwaggerEnabledStatusReplaceEnvironmentPostProcessor \ No newline at end of file +com.baiye.swagger.SwaggerEnabledStatusReplaceEnvironmentPostProcessor \ No newline at end of file diff --git a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports index 462d184..c734418 100644 --- a/ad-distribute-starters/ad-distribute-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports +++ b/ad-distribute-starters/ad-distribute-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports @@ -1 +1 @@ -com.hccake.ballcat.common.swagger.SwaggerEnabledStatusReplaceEnvironmentPostProcessor \ No newline at end of file +SwaggerEnabledStatusReplaceEnvironmentPostProcessor \ No newline at end of file diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java similarity index 90% rename from ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java rename to ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java index 0614af3..cfa2085 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.autoconfigure.websocket; +package com.baiye.ballcat.autoconfigure.websocket; /** * websocket 消息分发器类型常量类 diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java similarity index 87% rename from ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java rename to ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java index 246713a..60d909d 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.autoconfigure.websocket; +package com.baiye.ballcat.autoconfigure.websocket; import org.springframework.web.socket.config.annotation.SockJsServiceRegistration; diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java similarity index 82% rename from ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java rename to ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java index 9ed184c..3e8e968 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java @@ -1,13 +1,13 @@ -package com.hccake.ballcat.autoconfigure.websocket; +package com.baiye.ballcat.autoconfigure.websocket; -import com.hccake.ballcat.autoconfigure.websocket.config.LocalMessageDistributorConfig; -import com.hccake.ballcat.autoconfigure.websocket.config.RocketMqMessageDistributorConfig; -import com.hccake.ballcat.autoconfigure.websocket.config.RedisMessageDistributorConfig; -import com.hccake.ballcat.autoconfigure.websocket.config.WebSocketHandlerConfig; -import com.hccake.ballcat.common.websocket.handler.JsonMessageHandler; -import com.hccake.ballcat.common.websocket.handler.PingJsonMessageHandler; -import com.hccake.ballcat.common.websocket.holder.JsonMessageHandlerInitializer; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import com.baiye.ballcat.autoconfigure.websocket.config.LocalMessageDistributorConfig; +import com.baiye.ballcat.autoconfigure.websocket.config.RedisMessageDistributorConfig; +import com.baiye.ballcat.autoconfigure.websocket.config.RocketMqMessageDistributorConfig; +import com.baiye.ballcat.autoconfigure.websocket.config.WebSocketHandlerConfig; +import com.baiye.handler.JsonMessageHandler; +import com.baiye.handler.PingJsonMessageHandler; +import com.baiye.holder.JsonMessageHandlerInitializer; +import com.baiye.message.JsonWebSocketMessage; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketProperties.java b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/WebSocketProperties.java similarity index 92% rename from ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketProperties.java rename to ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/WebSocketProperties.java index 5e537f1..ee3402d 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketProperties.java +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/WebSocketProperties.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.autoconfigure.websocket; +package com.baiye.ballcat.autoconfigure.websocket; -import com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions; +import com.baiye.handler.ConcurrentWebSocketSessionOptions; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java similarity index 69% rename from ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java rename to ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java index 3cc3e35..defb72a 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.autoconfigure.websocket.config; +package com.baiye.ballcat.autoconfigure.websocket.config; -import com.hccake.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; -import com.hccake.ballcat.autoconfigure.websocket.WebSocketProperties; -import com.hccake.ballcat.common.websocket.distribute.LocalMessageDistributor; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import com.baiye.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; +import com.baiye.ballcat.autoconfigure.websocket.WebSocketProperties; +import com.baiye.distribute.LocalMessageDistributor; +import com.baiye.distribute.MessageDistributor; +import com.baiye.session.WebSocketSessionStore; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java similarity index 79% rename from ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java rename to ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java index c5bdf9d..6328e8b 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.autoconfigure.websocket.config; +package com.baiye.ballcat.autoconfigure.websocket.config; -import com.hccake.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; -import com.hccake.ballcat.autoconfigure.websocket.WebSocketProperties; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -import com.hccake.ballcat.common.websocket.distribute.RedisMessageDistributor; -import com.hccake.ballcat.common.websocket.distribute.RedisMessageListenerInitializer; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import com.baiye.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; +import com.baiye.ballcat.autoconfigure.websocket.WebSocketProperties; +import com.baiye.distribute.MessageDistributor; +import com.baiye.distribute.RedisMessageDistributor; +import com.baiye.distribute.RedisMessageListenerInitializer; +import com.baiye.session.WebSocketSessionStore; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java similarity index 69% rename from ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java rename to ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java index 5424b3c..0a8446a 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.autoconfigure.websocket.config; +package com.baiye.ballcat.autoconfigure.websocket.config; -import com.hccake.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; -import com.hccake.ballcat.autoconfigure.websocket.WebSocketProperties; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -import com.hccake.ballcat.common.websocket.distribute.RocketmqMessageDistributor; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import com.baiye.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; +import com.baiye.ballcat.autoconfigure.websocket.WebSocketProperties; +import com.baiye.distribute.MessageDistributor; +import com.baiye.distribute.RocketmqMessageDistributor; +import com.baiye.session.WebSocketSessionStore; import lombok.RequiredArgsConstructor; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java similarity index 69% rename from ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java rename to ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java index 37d8030..4899edb 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/java/com/baiye/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.autoconfigure.websocket.config; +package com.baiye.ballcat.autoconfigure.websocket.config; -import com.hccake.ballcat.autoconfigure.websocket.WebSocketProperties; -import com.hccake.ballcat.common.websocket.handler.CustomWebSocketHandler; -import com.hccake.ballcat.common.websocket.handler.PlanTextMessageHandler; -import com.hccake.ballcat.common.websocket.session.DefaultWebSocketSessionStore; -import com.hccake.ballcat.common.websocket.session.MapSessionWebSocketHandlerDecorator; -import com.hccake.ballcat.common.websocket.session.SessionKeyGenerator; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import com.baiye.ballcat.autoconfigure.websocket.WebSocketProperties; +import com.baiye.handler.CustomWebSocketHandler; +import com.baiye.handler.PlanTextMessageHandler; +import com.baiye.session.DefaultWebSocketSessionStore; +import com.baiye.session.MapSessionWebSocketHandlerDecorator; +import com.baiye.session.SessionKeyGenerator; +import com.baiye.session.WebSocketSessionStore; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json index ced24d9..b734cc0 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -3,28 +3,28 @@ { "name": "ballcat.websocket.concurrent.buffer-size-limit", "type": "java.lang.Integer", - "sourceType": "com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions", + "sourceType": "com.baiye.handler.ConcurrentWebSocketSessionOptions", "description": "发送消息缓冲上限 (byte)", "defaultValue": 102400 }, { "name": "ballcat.websocket.concurrent.enable", "type": "java.lang.Boolean", - "sourceType": "com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions", + "sourceType": "com.baiye.handler.ConcurrentWebSocketSessionOptions", "description": "是否在多线程环境下进行发送", "defaultValue": false }, { "name": "ballcat.websocket.concurrent.overflow-strategy", "type": "org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator$OverflowStrategy", - "sourceType": "com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions", + "sourceType": "com.baiye.handler.ConcurrentWebSocketSessionOptions", "description": "缓冲区溢出时的执行策略", "defaultValue": "org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator.OverflowStrategy.TERMINATE" }, { "name": "ballcat.websocket.concurrent.send-time-limit", "type": "java.lang.Integer", - "sourceType": "com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions", + "sourceType": "com.baiye.handler.ConcurrentWebSocketSessionOptions", "description": "发送时间的限制（ms）", "defaultValue": 5000 } diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/spring.factories b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/spring.factories index 5cc8984..ed0a0f4 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/spring.factories +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.autoconfigure.websocket.WebSocketAutoConfiguration \ No newline at end of file + com.baiye.ballcat.autoconfigure.websocket.WebSocketAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index eeca7d3..f82a3e2 100644 --- a/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ad-distribute-starters/ad-distribute-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.autoconfigure.websocket.WebSocketAutoConfiguration \ No newline at end of file +com.baiye.ballcat.autoconfigure.websocket.WebSocketAutoConfiguration \ No newline at end of file diff --git a/ad-distribute-starters/pom.xml b/ad-distribute-starters/pom.xml index a729bb6..08e584f 100644 --- a/ad-distribute-starters/pom.xml +++ b/ad-distribute-starters/pom.xml @@ -13,7 +13,6 @@ ad-distribute-starters - ad-distribute-starter-oss ad-distribute-starter-redis ad-distribute-starter-swagger ad-distribute-starter-file diff --git a/ad-distribute-system/system-biz/pom.xml b/ad-distribute-system/system-biz/pom.xml index d852466..eef9a75 100644 --- a/ad-distribute-system/system-biz/pom.xml +++ b/ad-distribute-system/system-biz/pom.xml @@ -46,10 +46,5 @@ ad-distribute-starter-file 1.1.0 - - com.baiye - ad-distribute-starter-oss - 1.1.0 - diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/BallcatOAuth2TokenResponseEnhancer.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/BallcatOAuth2TokenResponseEnhancer.java similarity index 88% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/BallcatOAuth2TokenResponseEnhancer.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/BallcatOAuth2TokenResponseEnhancer.java index 7687c21..0e2354a 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/BallcatOAuth2TokenResponseEnhancer.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/BallcatOAuth2TokenResponseEnhancer.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.system.authentication; +package com.baiye.system.authentication; -import com.hccake.ballcat.common.security.constant.TokenAttributeNameConstants; -import com.hccake.ballcat.common.security.constant.UserAttributeNameConstants; -import com.hccake.ballcat.common.security.userdetails.User; -import com.hccake.ballcat.system.model.vo.SysUserInfo; +import com.baiye.security.constant.TokenAttributeNameConstants; +import com.baiye.security.constant.UserAttributeNameConstants; +import com.baiye.security.userdetails.User; +import com.baiye.system.model.vo.SysUserInfo; import org.ballcat.springsecurity.oauth2.server.authorization.web.authentication.OAuth2TokenResponseEnhancer; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/DefaultUserInfoCoordinatorImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/DefaultUserInfoCoordinatorImpl.java similarity index 75% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/DefaultUserInfoCoordinatorImpl.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/DefaultUserInfoCoordinatorImpl.java index e248b57..deb943e 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/DefaultUserInfoCoordinatorImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/DefaultUserInfoCoordinatorImpl.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.system.authentication; +package com.baiye.system.authentication; -import com.hccake.ballcat.system.model.dto.UserInfoDTO; +import com.baiye.system.model.dto.UserInfoDTO; import java.util.Map; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/SysUserDetailsServiceImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/SysUserDetailsServiceImpl.java similarity index 88% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/SysUserDetailsServiceImpl.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/SysUserDetailsServiceImpl.java index bd09046..3b67a1c 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/SysUserDetailsServiceImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/SysUserDetailsServiceImpl.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.system.authentication; +package com.baiye.system.authentication; -import com.hccake.ballcat.common.security.constant.UserAttributeNameConstants; -import com.hccake.ballcat.common.security.userdetails.User; -import com.hccake.ballcat.system.model.dto.UserInfoDTO; -import com.hccake.ballcat.system.model.entity.SysUser; -import com.hccake.ballcat.system.service.SysUserService; +import com.baiye.security.constant.UserAttributeNameConstants; +import com.baiye.security.userdetails.User; +import com.baiye.system.model.dto.UserInfoDTO; +import com.baiye.system.model.entity.SysUser; +import com.baiye.system.service.SysUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.GrantedAuthority; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/UserInfoCoordinator.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/UserInfoCoordinator.java similarity index 83% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/UserInfoCoordinator.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/UserInfoCoordinator.java index 94703e2..6453e55 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/authentication/UserInfoCoordinator.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/authentication/UserInfoCoordinator.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.system.authentication; +package com.baiye.system.authentication; -import com.hccake.ballcat.system.model.dto.UserInfoDTO; +import com.baiye.system.model.dto.UserInfoDTO; import java.util.Map; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/checker/AdminUserChecker.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/checker/AdminUserChecker.java similarity index 81% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/checker/AdminUserChecker.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/checker/AdminUserChecker.java index 3781815..db99dec 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/checker/AdminUserChecker.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/checker/AdminUserChecker.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.system.checker; +package com.baiye.system.checker; -import com.hccake.ballcat.system.model.entity.SysUser; +import com.baiye.system.model.entity.SysUser; /** * 超级管理员账户规则配置 diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/checker/AdminUserCheckerImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/checker/AdminUserCheckerImpl.java similarity index 81% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/checker/AdminUserCheckerImpl.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/checker/AdminUserCheckerImpl.java index 829aff1..1a1cfab 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/checker/AdminUserCheckerImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/checker/AdminUserCheckerImpl.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.system.checker; +package com.baiye.system.checker; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.ballcat.common.security.util.SecurityUtils; -import com.hccake.ballcat.system.model.entity.SysUser; -import com.hccake.ballcat.system.properties.SystemProperties; +import com.baiye.security.util.SecurityUtils; +import com.baiye.system.model.entity.SysUser; +import com.baiye.system.properties.SystemProperties; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/component/PasswordHelper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/component/PasswordHelper.java similarity index 88% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/component/PasswordHelper.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/component/PasswordHelper.java index ec20749..4027d49 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/component/PasswordHelper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/component/PasswordHelper.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.system.component; +package com.baiye.system.component; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.crypto.CryptoException; -import com.hccake.ballcat.common.core.exception.BusinessException; -import com.hccake.ballcat.common.security.util.PasswordUtils; -import com.hccake.ballcat.system.properties.SystemProperties; +import com.baiye.exception.BusinessException; +import com.baiye.security.util.PasswordUtils; +import com.baiye.system.properties.SystemProperties; import org.ballcat.security.properties.SecurityProperties; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Component; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/manager/SysDictManager.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/manager/SysDictManager.java similarity index 87% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/manager/SysDictManager.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/manager/SysDictManager.java index f564163..0d4997b 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/manager/SysDictManager.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/manager/SysDictManager.java @@ -1,24 +1,24 @@ -package com.hccake.ballcat.system.manager; +package com.baiye.system.manager; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; -import com.hccake.ballcat.common.core.exception.BusinessException; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.model.result.BaseResultCode; -import com.hccake.ballcat.system.converter.SysDictItemConverter; -import com.hccake.ballcat.system.event.DictChangeEvent; -import com.hccake.ballcat.system.model.dto.SysDictItemDTO; -import com.hccake.ballcat.system.model.entity.SysDict; -import com.hccake.ballcat.system.model.entity.SysDictItem; -import com.hccake.ballcat.system.model.qo.SysDictQO; -import com.hccake.ballcat.system.model.vo.DictDataVO; -import com.hccake.ballcat.system.model.vo.DictItemVO; -import com.hccake.ballcat.system.model.vo.SysDictItemPageVO; -import com.hccake.ballcat.system.model.vo.SysDictPageVO; -import com.hccake.ballcat.system.service.SysDictItemService; -import com.hccake.ballcat.system.service.SysDictService; +import com.baiye.exception.BusinessException; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.result.BaseResultCode; +import com.baiye.system.converter.SysDictItemConverter; +import com.baiye.system.event.DictChangeEvent; +import com.baiye.system.model.dto.SysDictItemDTO; +import com.baiye.system.model.entity.SysDict; +import com.baiye.system.model.entity.SysDictItem; +import com.baiye.system.model.qo.SysDictQO; +import com.baiye.system.model.vo.DictDataVO; +import com.baiye.system.model.vo.DictItemVO; +import com.baiye.system.model.vo.SysDictItemPageVO; +import com.baiye.system.model.vo.SysDictPageVO; +import com.baiye.system.service.SysDictItemService; +import com.baiye.system.service.SysDictService; import lombok.RequiredArgsConstructor; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysConfigMapper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysConfigMapper.java similarity index 80% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysConfigMapper.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysConfigMapper.java index 0104a40..b26a65f 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysConfigMapper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysConfigMapper.java @@ -1,17 +1,17 @@ -package com.hccake.ballcat.system.mapper; +package com.baiye.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.system.converter.SysConfigConverter; -import com.hccake.ballcat.system.model.entity.SysConfig; -import com.hccake.ballcat.system.model.qo.SysConfigQO; -import com.hccake.ballcat.system.model.vo.SysConfigPageVO; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; -import com.hccake.extend.mybatis.plus.toolkit.WrappersX; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.system.converter.SysConfigConverter; +import com.baiye.system.model.entity.SysConfig; +import com.baiye.system.model.qo.SysConfigQO; +import com.baiye.system.model.vo.SysConfigPageVO; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.extend.mybatis.plus.toolkit.WrappersX; /** * 系统配置表 diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysDictItemMapper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysDictItemMapper.java similarity index 82% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysDictItemMapper.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysDictItemMapper.java index c58a3ef..d979bef 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysDictItemMapper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysDictItemMapper.java @@ -1,15 +1,15 @@ -package com.hccake.ballcat.system.mapper; +package com.baiye.system.mapper; +import com.baiye.system.converter.SysDictItemConverter; +import com.baiye.system.model.entity.SysDictItem; +import com.baiye.system.model.vo.SysDictItemPageVO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.system.converter.SysDictItemConverter; -import com.hccake.ballcat.system.model.entity.SysDictItem; -import com.hccake.ballcat.system.model.vo.SysDictItemPageVO; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysDictMapper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysDictMapper.java similarity index 76% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysDictMapper.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysDictMapper.java index 747b03f..36856e5 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysDictMapper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysDictMapper.java @@ -1,17 +1,17 @@ -package com.hccake.ballcat.system.mapper; +package com.baiye.system.mapper; +import com.baiye.system.converter.SysDictConverter; +import com.baiye.system.model.entity.SysDict; +import com.baiye.system.model.qo.SysDictQO; +import com.baiye.system.model.vo.SysDictPageVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.system.converter.SysDictConverter; -import com.hccake.ballcat.system.model.entity.SysDict; -import com.hccake.ballcat.system.model.qo.SysDictQO; -import com.hccake.ballcat.system.model.vo.SysDictPageVO; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; -import com.hccake.extend.mybatis.plus.toolkit.WrappersX; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.extend.mybatis.plus.toolkit.WrappersX; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysMenuMapper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysMenuMapper.java similarity index 87% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysMenuMapper.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysMenuMapper.java index 5366b75..98ccb4d 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysMenuMapper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysMenuMapper.java @@ -1,13 +1,13 @@ -package com.hccake.ballcat.system.mapper; +package com.baiye.system.mapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.system.model.entity.SysMenu; -import com.hccake.ballcat.system.model.qo.SysMenuQO; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; -import com.hccake.extend.mybatis.plus.toolkit.WrappersX; +import com.baiye.system.model.entity.SysMenu; +import com.baiye.system.model.qo.SysMenuQO; +import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.extend.mybatis.plus.toolkit.WrappersX; import java.io.Serializable; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysOrganizationMapper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysOrganizationMapper.java similarity index 89% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysOrganizationMapper.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysOrganizationMapper.java index ec556e5..8f534ab 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysOrganizationMapper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysOrganizationMapper.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.system.mapper; +package com.baiye.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hccake.ballcat.system.model.dto.OrganizationMoveChildParam; -import com.hccake.ballcat.system.model.entity.SysOrganization; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.system.model.dto.OrganizationMoveChildParam; +import com.baiye.system.model.entity.SysOrganization; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; import org.apache.ibatis.annotations.Param; import org.springframework.lang.Nullable; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysRoleMapper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysRoleMapper.java similarity index 70% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysRoleMapper.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysRoleMapper.java index 47e235b..212583a 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysRoleMapper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysRoleMapper.java @@ -1,17 +1,17 @@ -package com.hccake.ballcat.system.mapper; +package com.baiye.system.mapper; import cn.hutool.core.text.CharSequenceUtil; +import com.baiye.system.converter.SysRoleConverter; +import com.baiye.system.model.entity.SysRole; +import com.baiye.system.model.qo.SysRoleQO; +import com.baiye.system.model.vo.SysRolePageVO; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.model.domain.SelectData; -import com.hccake.ballcat.system.converter.SysRoleConverter; -import com.hccake.ballcat.system.model.entity.SysRole; -import com.hccake.ballcat.system.model.qo.SysRoleQO; -import com.hccake.ballcat.system.model.vo.SysRolePageVO; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; -import com.hccake.extend.mybatis.plus.toolkit.WrappersX; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.domain.SelectData; +import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.extend.mybatis.plus.toolkit.WrappersX; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysRoleMenuMapper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysRoleMenuMapper.java similarity index 88% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysRoleMenuMapper.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysRoleMenuMapper.java index 36534ab..5c2d4f5 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysRoleMenuMapper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysRoleMenuMapper.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.system.mapper; +package com.baiye.system.mapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hccake.ballcat.system.model.entity.SysRoleMenu; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.system.model.entity.SysRoleMenu; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; import java.io.Serializable; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysUserMapper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserMapper.java similarity index 88% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysUserMapper.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserMapper.java index d3174e2..d8661a0 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysUserMapper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserMapper.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.mapper; +package com.baiye.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,16 +7,16 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.common.core.constant.GlobalConstants; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.model.domain.SelectData; -import com.hccake.ballcat.system.model.entity.SysUser; -import com.hccake.ballcat.system.model.qo.SysUserQO; -import com.hccake.ballcat.system.model.vo.SysUserPageVO; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; -import com.hccake.extend.mybatis.plus.toolkit.WrappersX; +import com.baiye.constant.GlobalConstants; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.domain.SelectData; +import com.baiye.system.model.entity.SysUser; +import com.baiye.system.model.qo.SysUserQO; +import com.baiye.system.model.vo.SysUserPageVO; +import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.extend.mybatis.plus.toolkit.WrappersX; import org.apache.ibatis.annotations.Param; import java.util.Collection; @@ -46,6 +46,7 @@ public interface SysUserMapper extends ExtendMapper { .eqIfPresent(SysUser::getStatus, qo.getStatus()) .eqIfPresent(SysUser::getGender, qo.getGender()) .eqIfPresent(SysUser::getType, qo.getType()) + .eqIfPresent(SysUser::getWhichUserId, qo.getWhichUserId()) .inIfPresent(SysUser::getOrganizationId, qo.getOrganizationId()); if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { wrapperX.between(SysUser::getCreateTime, qo.getStartTime(), qo.getEndTime()); diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysUserRoleMapper.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserRoleMapper.java similarity index 84% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysUserRoleMapper.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserRoleMapper.java index f48785d..ce465bb 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysUserRoleMapper.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserRoleMapper.java @@ -1,16 +1,16 @@ -package com.hccake.ballcat.system.mapper; +package com.baiye.system.mapper; +import com.baiye.system.model.entity.SysUserRole; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.system.model.entity.SysRole; -import com.hccake.ballcat.system.model.entity.SysUserRole; -import com.hccake.ballcat.system.model.qo.RoleBindUserQO; -import com.hccake.ballcat.system.model.vo.RoleBindUserVO; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; -import com.hccake.extend.mybatis.plus.toolkit.WrappersX; +import com.baiye.system.model.entity.SysRole; +import com.baiye.system.model.qo.RoleBindUserQO; +import com.baiye.system.model.vo.RoleBindUserVO; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.extend.mybatis.plus.toolkit.WrappersX; import org.apache.ibatis.annotations.Param; import java.util.ArrayList; diff --git a/ad-distribute-system/system-biz/src/main/java/com/baiye/system/properties/BusinessProperties.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/properties/BusinessProperties.java new file mode 100644 index 0000000..d081d48 --- /dev/null +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/properties/BusinessProperties.java @@ -0,0 +1,22 @@ +package com.baiye.system.properties; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +import java.util.List; + +/** + * @author Enzo + * @date : 2022/10/30 + */ +@Getter +@Setter +@Configuration +@ConfigurationProperties(prefix = "business") +public class BusinessProperties { + + private List codes; + +} diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/properties/FileProperties.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/properties/FileProperties.java similarity index 94% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/properties/FileProperties.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/properties/FileProperties.java index 4e8ac0f..e87ac93 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/properties/FileProperties.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/properties/FileProperties.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.properties; +package com.baiye.system.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/properties/SystemProperties.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/properties/SystemProperties.java similarity index 94% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/properties/SystemProperties.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/properties/SystemProperties.java index 26bbc5e..b8b0d2c 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/properties/SystemProperties.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/properties/SystemProperties.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.properties; +package com.baiye.system.properties; import lombok.Getter; import lombok.Setter; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysConfigService.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysConfigService.java similarity index 68% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysConfigService.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysConfigService.java index b1690be..605e79b 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysConfigService.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysConfigService.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.system.service; +package com.baiye.system.service; -import com.hccake.ballcat.system.model.entity.SysConfig; -import com.hccake.ballcat.system.model.qo.SysConfigQO; -import com.hccake.ballcat.system.model.vo.SysConfigPageVO; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.extend.mybatis.plus.service.ExtendService; +import com.baiye.system.model.entity.SysConfig; +import com.baiye.system.model.qo.SysConfigQO; +import com.baiye.system.model.vo.SysConfigPageVO; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.service.ExtendService; /** * 系统配置表 diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysDictItemService.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysDictItemService.java similarity index 73% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysDictItemService.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysDictItemService.java index 4295f23..640195b 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysDictItemService.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysDictItemService.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.system.service; +package com.baiye.system.service; -import com.hccake.ballcat.system.model.entity.SysDictItem; -import com.hccake.ballcat.system.model.vo.SysDictItemPageVO; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.extend.mybatis.plus.service.ExtendService; +import com.baiye.system.model.entity.SysDictItem; +import com.baiye.system.model.vo.SysDictItemPageVO; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.service.ExtendService; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysDictService.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysDictService.java similarity index 70% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysDictService.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysDictService.java index d7ff036..9b18560 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysDictService.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysDictService.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.system.service; - -import com.hccake.ballcat.system.model.entity.SysDict; -import com.hccake.ballcat.system.model.qo.SysDictQO; -import com.hccake.ballcat.system.model.vo.SysDictPageVO; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.extend.mybatis.plus.service.ExtendService; +package com.baiye.system.service; + +import com.baiye.system.model.qo.SysDictQO; +import com.baiye.system.model.vo.SysDictPageVO; +import com.baiye.system.model.entity.SysDict; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.service.ExtendService; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysMenuService.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysMenuService.java similarity index 70% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysMenuService.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysMenuService.java index 5debb4f..f5dbc82 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysMenuService.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysMenuService.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.system.service; +package com.baiye.system.service; -import com.hccake.ballcat.system.model.dto.SysMenuCreateDTO; -import com.hccake.ballcat.system.model.dto.SysMenuUpdateDTO; -import com.hccake.ballcat.system.model.entity.SysMenu; -import com.hccake.ballcat.system.model.qo.SysMenuQO; -import com.hccake.extend.mybatis.plus.service.ExtendService; +import com.baiye.system.model.dto.SysMenuCreateDTO; +import com.baiye.system.model.dto.SysMenuUpdateDTO; +import com.baiye.system.model.qo.SysMenuQO; +import com.baiye.system.model.entity.SysMenu; +import com.baiye.extend.mybatis.plus.service.ExtendService; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysOrganizationService.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysOrganizationService.java similarity index 79% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysOrganizationService.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysOrganizationService.java index b971f26..6a82272 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysOrganizationService.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysOrganizationService.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.system.service; +package com.baiye.system.service; -import com.hccake.ballcat.system.model.dto.SysOrganizationDTO; -import com.hccake.ballcat.system.model.entity.SysOrganization; -import com.hccake.ballcat.system.model.qo.SysOrganizationQO; -import com.hccake.ballcat.system.model.vo.SysOrganizationTree; -import com.hccake.extend.mybatis.plus.service.ExtendService; +import com.baiye.system.model.qo.SysOrganizationQO; +import com.baiye.system.model.vo.SysOrganizationTree; +import com.baiye.system.model.dto.SysOrganizationDTO; +import com.baiye.system.model.entity.SysOrganization; +import com.baiye.extend.mybatis.plus.service.ExtendService; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleMenuService.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysRoleMenuService.java similarity index 84% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleMenuService.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysRoleMenuService.java index d63d3f1..9d8ebce 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleMenuService.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysRoleMenuService.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.system.service; +package com.baiye.system.service; -import com.hccake.ballcat.system.model.entity.SysRoleMenu; -import com.hccake.extend.mybatis.plus.service.ExtendService; +import com.baiye.system.model.entity.SysRoleMenu; +import com.baiye.extend.mybatis.plus.service.ExtendService; import java.io.Serializable; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysRoleService.java similarity index 59% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysRoleService.java index 8afbb4c..ccb29bf 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysRoleService.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.system.service; +package com.baiye.system.service; -import com.hccake.ballcat.system.model.entity.SysRole; -import com.hccake.ballcat.system.model.qo.SysRoleQO; -import com.hccake.ballcat.system.model.vo.SysRolePageVO; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.model.domain.SelectData; -import com.hccake.extend.mybatis.plus.service.ExtendService; +import com.baiye.system.model.entity.SysRole; +import com.baiye.system.model.qo.SysRoleQO; +import com.baiye.system.model.vo.SysRolePageVO; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.domain.SelectData; +import com.baiye.extend.mybatis.plus.service.ExtendService; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysUserRoleService.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserRoleService.java similarity index 74% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysUserRoleService.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserRoleService.java index 46e07fb..75a5c23 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysUserRoleService.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserRoleService.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.system.service; +package com.baiye.system.service; -import com.hccake.ballcat.system.model.entity.SysRole; -import com.hccake.ballcat.system.model.entity.SysUserRole; -import com.hccake.ballcat.system.model.qo.RoleBindUserQO; -import com.hccake.ballcat.system.model.vo.RoleBindUserVO; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.extend.mybatis.plus.service.ExtendService; +import com.baiye.system.model.entity.SysRole; +import com.baiye.system.model.entity.SysUserRole; +import com.baiye.system.model.vo.RoleBindUserVO; +import com.baiye.system.model.qo.RoleBindUserQO; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.service.ExtendService; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysUserService.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserService.java similarity index 84% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysUserService.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserService.java index a766e3c..a07c194 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/SysUserService.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserService.java @@ -1,15 +1,15 @@ -package com.hccake.ballcat.system.service; - -import com.hccake.ballcat.system.model.dto.SysUserDTO; -import com.hccake.ballcat.system.model.dto.SysUserScope; -import com.hccake.ballcat.system.model.dto.UserInfoDTO; -import com.hccake.ballcat.system.model.entity.SysUser; -import com.hccake.ballcat.system.model.qo.SysUserQO; -import com.hccake.ballcat.system.model.vo.SysUserPageVO; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.model.domain.SelectData; -import com.hccake.extend.mybatis.plus.service.ExtendService; +package com.baiye.system.service; + +import com.baiye.system.model.dto.SysUserDTO; +import com.baiye.system.model.dto.SysUserScope; +import com.baiye.system.model.dto.UserInfoDTO; +import com.baiye.system.model.qo.SysUserQO; +import com.baiye.system.model.vo.SysUserPageVO; +import com.baiye.system.model.entity.SysUser; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.domain.SelectData; +import com.baiye.extend.mybatis.plus.service.ExtendService; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; @@ -31,6 +31,8 @@ public interface SysUserService extends ExtendService { */ PageResult queryPage(PageParam pageParam, SysUserQO qo); + PageResult queryAll(PageParam pageParam, SysUserQO qo); + /** * 根据用户名查询用户 * @param username 用户名 diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysConfigServiceImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysConfigServiceImpl.java similarity index 68% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysConfigServiceImpl.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysConfigServiceImpl.java index 2920fe1..df2f08d 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysConfigServiceImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysConfigServiceImpl.java @@ -1,17 +1,17 @@ -package com.hccake.ballcat.system.service.impl; +package com.baiye.system.service.impl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.redis.core.annotation.CacheDel; -import com.hccake.ballcat.common.redis.core.annotation.Cached; -import com.hccake.ballcat.system.constant.SystemRedisKeyConstants; -import com.hccake.ballcat.system.mapper.SysConfigMapper; -import com.hccake.ballcat.system.model.entity.SysConfig; -import com.hccake.ballcat.system.model.qo.SysConfigQO; -import com.hccake.ballcat.system.model.vo.SysConfigPageVO; -import com.hccake.ballcat.system.service.SysConfigService; -import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.core.annotation.CacheDel; +import com.baiye.core.annotation.Cached; +import com.baiye.system.constant.SystemRedisKeyConstants; +import com.baiye.system.mapper.SysConfigMapper; +import com.baiye.system.model.entity.SysConfig; +import com.baiye.system.model.qo.SysConfigQO; +import com.baiye.system.model.vo.SysConfigPageVO; +import com.baiye.system.service.SysConfigService; +import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; /** diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysDictItemServiceImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysDictItemServiceImpl.java similarity index 74% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysDictItemServiceImpl.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysDictItemServiceImpl.java index 526508a..ad5b807 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysDictItemServiceImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysDictItemServiceImpl.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.system.service.impl; +package com.baiye.system.service.impl; -import com.hccake.ballcat.system.mapper.SysDictItemMapper; -import com.hccake.ballcat.system.model.entity.SysDictItem; -import com.hccake.ballcat.system.model.vo.SysDictItemPageVO; -import com.hccake.ballcat.system.service.SysDictItemService; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.system.mapper.SysDictItemMapper; +import com.baiye.system.model.entity.SysDictItem; +import com.baiye.system.model.vo.SysDictItemPageVO; +import com.baiye.system.service.SysDictItemService; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysDictServiceImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysDictServiceImpl.java similarity index 73% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysDictServiceImpl.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysDictServiceImpl.java index e5908d5..f135308 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysDictServiceImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysDictServiceImpl.java @@ -1,14 +1,14 @@ -package com.hccake.ballcat.system.service.impl; +package com.baiye.system.service.impl; import cn.hutool.core.util.IdUtil; -import com.hccake.ballcat.system.mapper.SysDictMapper; -import com.hccake.ballcat.system.model.entity.SysDict; -import com.hccake.ballcat.system.model.qo.SysDictQO; -import com.hccake.ballcat.system.model.vo.SysDictPageVO; -import com.hccake.ballcat.system.service.SysDictService; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.system.mapper.SysDictMapper; +import com.baiye.system.model.entity.SysDict; +import com.baiye.system.model.qo.SysDictQO; +import com.baiye.system.model.vo.SysDictPageVO; +import com.baiye.system.service.SysDictService; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysMenuServiceImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysMenuServiceImpl.java similarity index 84% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysMenuServiceImpl.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysMenuServiceImpl.java index 5076d3e..b28bebd 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysMenuServiceImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysMenuServiceImpl.java @@ -1,21 +1,21 @@ -package com.hccake.ballcat.system.service.impl; +package com.baiye.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; +import com.baiye.system.converter.SysMenuConverter; +import com.baiye.system.mapper.SysMenuMapper; +import com.baiye.system.model.dto.SysMenuCreateDTO; +import com.baiye.system.model.dto.SysMenuUpdateDTO; +import com.baiye.system.model.qo.SysMenuQO; +import com.baiye.system.service.SysMenuService; +import com.baiye.system.service.SysRoleMenuService; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.common.core.exception.BusinessException; -import com.hccake.ballcat.common.i18n.I18nMessage; -import com.hccake.ballcat.common.i18n.I18nMessageCreateEvent; -import com.hccake.ballcat.common.model.result.BaseResultCode; -import com.hccake.ballcat.system.converter.SysMenuConverter; -import com.hccake.ballcat.system.mapper.SysMenuMapper; -import com.hccake.ballcat.system.model.dto.SysMenuCreateDTO; -import com.hccake.ballcat.system.model.dto.SysMenuUpdateDTO; -import com.hccake.ballcat.system.model.entity.SysMenu; -import com.hccake.ballcat.system.model.qo.SysMenuQO; -import com.hccake.ballcat.system.service.SysMenuService; -import com.hccake.ballcat.system.service.SysRoleMenuService; -import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.exception.BusinessException; +import com.baiye.I18nMessage; +import com.baiye.I18nMessageCreateEvent; +import com.baiye.result.BaseResultCode; +import com.baiye.system.model.entity.SysMenu; +import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationEventPublisher; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysOrganizationServiceImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysOrganizationServiceImpl.java similarity index 89% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysOrganizationServiceImpl.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysOrganizationServiceImpl.java index ce4a4b7..8db68f3 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysOrganizationServiceImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysOrganizationServiceImpl.java @@ -1,27 +1,25 @@ -package com.hccake.ballcat.system.service.impl; +package com.baiye.system.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; +import com.baiye.system.mapper.SysOrganizationMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.common.core.constant.GlobalConstants; -import com.hccake.ballcat.common.core.exception.BusinessException; -import com.hccake.ballcat.common.model.result.BaseResultCode; -import com.hccake.ballcat.common.util.tree.TreeUtils; -import com.hccake.ballcat.system.converter.SysOrganizationConverter; -import com.hccake.ballcat.system.mapper.SysOrganizationMapper; -import com.hccake.ballcat.system.model.dto.OrganizationMoveChildParam; -import com.hccake.ballcat.system.model.dto.SysOrganizationDTO; -import com.hccake.ballcat.system.model.entity.SysOrganization; -import com.hccake.ballcat.system.model.qo.SysOrganizationQO; -import com.hccake.ballcat.system.model.vo.SysOrganizationTree; -import com.hccake.ballcat.system.service.SysOrganizationService; -import com.hccake.ballcat.system.service.SysUserService; -import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.constant.GlobalConstants; +import com.baiye.exception.BusinessException; +import com.baiye.result.BaseResultCode; +import com.baiye.util.tree.TreeUtils; +import com.baiye.system.converter.SysOrganizationConverter; +import com.baiye.system.model.dto.OrganizationMoveChildParam; +import com.baiye.system.model.dto.SysOrganizationDTO; +import com.baiye.system.model.entity.SysOrganization; +import com.baiye.system.model.qo.SysOrganizationQO; +import com.baiye.system.model.vo.SysOrganizationTree; +import com.baiye.system.service.SysOrganizationService; +import com.baiye.system.service.SysUserService; +import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleMenuServiceImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysRoleMenuServiceImpl.java similarity index 85% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleMenuServiceImpl.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysRoleMenuServiceImpl.java index 99a8f5a..bd9b615 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleMenuServiceImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysRoleMenuServiceImpl.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.system.service.impl; +package com.baiye.system.service.impl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.system.mapper.SysRoleMenuMapper; -import com.hccake.ballcat.system.model.entity.SysRoleMenu; -import com.hccake.ballcat.system.service.SysRoleMenuService; -import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.system.mapper.SysRoleMenuMapper; +import com.baiye.system.model.entity.SysRoleMenu; +import com.baiye.system.service.SysRoleMenuService; +import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysRoleServiceImpl.java similarity index 54% rename from ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java rename to ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysRoleServiceImpl.java index 922f6ba..f1108a7 100644 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java +++ b/ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysRoleServiceImpl.java @@ -1,24 +1,28 @@ -package com.hccake.ballcat.system.service.impl; +package com.baiye.system.service.impl; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baiye.constant.DefaultNumberConstants; +import com.baiye.security.util.SecurityUtils; +import com.baiye.system.model.entity.SysRole; +import com.baiye.system.model.qo.SysRoleQO; +import com.baiye.system.model.vo.SysRolePageVO; +import com.baiye.system.properties.BusinessProperties; +import com.baiye.system.service.SysRoleMenuService; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.common.core.exception.BusinessException; -import com.hccake.ballcat.common.model.result.BaseResultCode; -import com.hccake.ballcat.system.mapper.SysRoleMapper; -import com.hccake.ballcat.system.model.entity.SysRole; -import com.hccake.ballcat.system.model.qo.SysRoleQO; -import com.hccake.ballcat.system.model.vo.SysRolePageVO; -import com.hccake.ballcat.system.service.SysRoleMenuService; -import com.hccake.ballcat.system.service.SysRoleService; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.model.domain.SelectData; -import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.exception.BusinessException; +import com.baiye.result.BaseResultCode; +import com.baiye.system.mapper.SysRoleMapper; +import com.baiye.system.service.SysRoleService; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.domain.SelectData; +import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; +import java.util.Arrays; +import java.util.Iterator; import java.util.List; /** @@ -35,10 +39,13 @@ public class SysRoleServiceImpl extends ExtendServiceImpl> + * + * @return List> */ @Override public List> listSelectData() { - return baseMapper.listSelectData(); + List> selectData = baseMapper.listSelectData(); + if (SecurityUtils.getCurrentUserId() == DefaultNumberConstants.ONE_NUMBER) { + return selectData; + } + Iterator> iterator = selectData.iterator(); + while (iterator.hasNext()) { + SelectData next = iterator.next(); + String code = String.valueOf(next.getValue()); + List codeList = Arrays.asList(code.split(",")); + for (String c : codeList) { + if (businessProperties.getCodes().contains(c)) { + iterator.remove(); + } + } + } + return selectData; } /** * 是否存在角色code + * * @param roleCode 角色code * @return boolean 是否存在 */ @@ -80,6 +105,7 @@ public class SysRoleServiceImpl extends ExtendServiceImpl implements SysUserService { - private final FileService fileService; - private final SysMenuService sysMenuService; private final SysUserRoleService sysUserRoleService; @@ -80,6 +81,24 @@ public class SysUserServiceImpl extends ExtendServiceImpl queryPage(PageParam pageParam, SysUserQO qo) { + PageResult result = baseMapper.queryPage(pageParam, qo); + + List sysUsers = baseMapper.selectList(new LambdaQueryWrapper<>()); + List userAll = Convert.toList(SysUserPageVO.class, sysUsers); + Map> userGroup = userAll.stream() + .collect(Collectors.groupingBy(SysUserPageVO::getWhichUserId)); + + result.getRecords().forEach(user -> { + List byWhichUserId = userGroup.get(user.getUserId()); + if (CollUtil.isNotEmpty(byWhichUserId)) { + user.setChildren(byWhichUserId); + } + }); + return result; + } + + @Override + public PageResult queryAll(PageParam pageParam, SysUserQO qo) { return baseMapper.queryPage(pageParam, qo); } @@ -154,6 +173,7 @@ public class SysUserServiceImpl extends ExtendServiceImpl { log.error("[addSysUser] 数据插入系统用户表失败，user：{}", sysUserDto); diff --git a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/file/service/FileService.java b/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/file/service/FileService.java deleted file mode 100644 index a0ad82b..0000000 --- a/ad-distribute-system/system-biz/src/main/java/com/hccake/ballcat/file/service/FileService.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hccake.ballcat.file.service; - -import com.hccake.ballcat.common.oss.OssClient; -import com.hccake.starter.file.core.FileClient; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.io.InputStream; - -/** - * @author lingting 2021/5/27 11:14 - */ -@Component -public class FileService { - - private OssClient ossClient; - - private final FileClient fileClient; - - public FileService(ApplicationContext context) { - try { - ossClient = context.getBean(OssClient.class); - } - catch (Exception ignore) { - ossClient = null; - } - - // oss 为空或者未配置 - if (ossClient == null || !ossClient.isEnable()) { - fileClient = context.getBean(FileClient.class); - } - else { - fileClient = null; - } - } - - public String upload(InputStream stream, String relativePath, Long size) throws IOException { - if (fileClient != null) { - return fileClient.upload(stream, relativePath); - } - - return ossClient.upload(stream, relativePath, size); - } - -} diff --git a/ad-distribute-system/system-biz/src/main/resources/mapper/SysMenuMapper.xml b/ad-distribute-system/system-biz/src/main/resources/mapper/SysMenuMapper.xml index 19f84d4..9c74978 100644 --- a/ad-distribute-system/system-biz/src/main/resources/mapper/SysMenuMapper.xml +++ b/ad-distribute-system/system-biz/src/main/resources/mapper/SysMenuMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -60,7 +60,7 @@ - SELECT FROM diff --git a/ad-distribute-system/system-biz/src/main/resources/mapper/SysOrganizationMapper.xml b/ad-distribute-system/system-biz/src/main/resources/mapper/SysOrganizationMapper.xml index 4798da7..8857655 100644 --- a/ad-distribute-system/system-biz/src/main/resources/mapper/SysOrganizationMapper.xml +++ b/ad-distribute-system/system-biz/src/main/resources/mapper/SysOrganizationMapper.xml @@ -1,6 +1,6 @@ - + id, @@ -34,7 +34,7 @@ ) - SELECT FROM diff --git a/ad-distribute-system/system-biz/src/main/resources/mapper/SysRoleMapper.xml b/ad-distribute-system/system-biz/src/main/resources/mapper/SysRoleMapper.xml index 443d6bf..472ad20 100644 --- a/ad-distribute-system/system-biz/src/main/resources/mapper/SysRoleMapper.xml +++ b/ad-distribute-system/system-biz/src/main/resources/mapper/SysRoleMapper.xml @@ -1,8 +1,8 @@ - + - select name, code as value from diff --git a/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml b/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml index 41b0701..66d51cc 100644 --- a/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml @@ -1,6 +1,6 @@ - + su.user_id, @@ -14,10 +14,11 @@ su.type, su.organization_id, su.create_time, - su.update_time + su.update_time, + su.which_user_id - SELECT ,so.name as organization_name @@ -29,7 +30,7 @@ - SELECT FROM @@ -48,7 +49,7 @@ AND su.deleted = 0 - select username as name , user_id as value from diff --git a/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserRoleMapper.xml b/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserRoleMapper.xml index 6bcd838..6930a48 100644 --- a/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserRoleMapper.xml +++ b/ad-distribute-system/system-biz/src/main/resources/mapper/SysUserRoleMapper.xml @@ -1,8 +1,8 @@ - + - SELECT r.id, r.name, r.code, r.type, r.scope_type, r.scope_resources FROM @@ -16,7 +16,7 @@ - SELECT su.user_id, su.username, su.nickname, so.name as organization_name FROM diff --git a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysConfigController.java b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysConfigController.java similarity index 79% rename from ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysConfigController.java rename to ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysConfigController.java index 508abb4..2fa5f5c 100644 --- a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysConfigController.java +++ b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysConfigController.java @@ -1,15 +1,15 @@ -package com.hccake.ballcat.system.controller; +package com.baiye.system.controller; -import com.hccake.ballcat.common.log.operation.annotation.CreateOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.DeleteOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.UpdateOperationLogging; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.system.model.entity.SysConfig; -import com.hccake.ballcat.system.model.qo.SysConfigQO; -import com.hccake.ballcat.system.model.vo.SysConfigPageVO; -import com.hccake.ballcat.system.service.SysConfigService; +import com.baiye.operation.annotation.CreateOperationLogging; +import com.baiye.operation.annotation.DeleteOperationLogging; +import com.baiye.operation.annotation.UpdateOperationLogging; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.result.R; +import com.baiye.system.model.qo.SysConfigQO; +import com.baiye.system.model.vo.SysConfigPageVO; +import com.baiye.system.model.entity.SysConfig; +import com.baiye.system.service.SysConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysDictController.java b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysDictController.java similarity index 85% rename from ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysDictController.java rename to ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysDictController.java index d7d9df6..45cf811 100644 --- a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysDictController.java +++ b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysDictController.java @@ -1,21 +1,21 @@ -package com.hccake.ballcat.system.controller; - -import com.hccake.ballcat.common.core.validation.group.CreateGroup; -import com.hccake.ballcat.common.core.validation.group.UpdateGroup; -import com.hccake.ballcat.common.log.operation.annotation.CreateOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.DeleteOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.UpdateOperationLogging; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.model.result.BaseResultCode; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.system.manager.SysDictManager; -import com.hccake.ballcat.system.model.dto.SysDictItemDTO; -import com.hccake.ballcat.system.model.entity.SysDict; -import com.hccake.ballcat.system.model.qo.SysDictQO; -import com.hccake.ballcat.system.model.vo.DictDataVO; -import com.hccake.ballcat.system.model.vo.SysDictItemPageVO; -import com.hccake.ballcat.system.model.vo.SysDictPageVO; +package com.baiye.system.controller; + +import com.baiye.system.manager.SysDictManager; +import com.baiye.system.model.dto.SysDictItemDTO; +import com.baiye.system.model.entity.SysDict; +import com.baiye.system.model.qo.SysDictQO; +import com.baiye.system.model.vo.DictDataVO; +import com.baiye.system.model.vo.SysDictItemPageVO; +import com.baiye.system.model.vo.SysDictPageVO; +import com.baiye.validation.group.CreateGroup; +import com.baiye.validation.group.UpdateGroup; +import com.baiye.operation.annotation.CreateOperationLogging; +import com.baiye.operation.annotation.DeleteOperationLogging; +import com.baiye.operation.annotation.UpdateOperationLogging; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.result.BaseResultCode; +import com.baiye.result.R; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysMenuController.java b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysMenuController.java similarity index 79% rename from ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysMenuController.java rename to ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysMenuController.java index cc90e79..7354160 100644 --- a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysMenuController.java +++ b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysMenuController.java @@ -1,24 +1,24 @@ -package com.hccake.ballcat.system.controller; +package com.baiye.system.controller; import cn.hutool.core.collection.CollUtil; -import com.hccake.ballcat.common.log.operation.annotation.CreateOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.DeleteOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.UpdateOperationLogging; -import com.hccake.ballcat.common.model.result.BaseResultCode; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.security.constant.UserAttributeNameConstants; -import com.hccake.ballcat.common.security.userdetails.User; -import com.hccake.ballcat.common.security.util.SecurityUtils; -import com.hccake.ballcat.system.converter.SysMenuConverter; -import com.hccake.ballcat.system.enums.SysMenuType; -import com.hccake.ballcat.system.model.dto.SysMenuCreateDTO; -import com.hccake.ballcat.system.model.dto.SysMenuUpdateDTO; -import com.hccake.ballcat.system.model.entity.SysMenu; -import com.hccake.ballcat.system.model.qo.SysMenuQO; -import com.hccake.ballcat.system.model.vo.SysMenuGrantVO; -import com.hccake.ballcat.system.model.vo.SysMenuPageVO; -import com.hccake.ballcat.system.model.vo.SysMenuRouterVO; -import com.hccake.ballcat.system.service.SysMenuService; +import com.baiye.operation.annotation.CreateOperationLogging; +import com.baiye.operation.annotation.DeleteOperationLogging; +import com.baiye.operation.annotation.UpdateOperationLogging; +import com.baiye.result.BaseResultCode; +import com.baiye.result.R; +import com.baiye.security.constant.UserAttributeNameConstants; +import com.baiye.security.userdetails.User; +import com.baiye.security.util.SecurityUtils; +import com.baiye.system.converter.SysMenuConverter; +import com.baiye.system.enums.SysMenuType; +import com.baiye.system.model.dto.SysMenuCreateDTO; +import com.baiye.system.model.dto.SysMenuUpdateDTO; +import com.baiye.system.model.entity.SysMenu; +import com.baiye.system.model.qo.SysMenuQO; +import com.baiye.system.model.vo.SysMenuGrantVO; +import com.baiye.system.model.vo.SysMenuPageVO; +import com.baiye.system.model.vo.SysMenuRouterVO; +import com.baiye.system.service.SysMenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysOrganizationController.java b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysOrganizationController.java similarity index 81% rename from ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysOrganizationController.java rename to ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysOrganizationController.java index 6b32c4b..ca8a4b4 100644 --- a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysOrganizationController.java +++ b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysOrganizationController.java @@ -1,18 +1,18 @@ -package com.hccake.ballcat.system.controller; +package com.baiye.system.controller; import cn.hutool.core.collection.CollUtil; -import com.hccake.ballcat.common.log.operation.annotation.CreateOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.DeleteOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.UpdateOperationLogging; -import com.hccake.ballcat.common.model.result.BaseResultCode; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.system.converter.SysOrganizationConverter; -import com.hccake.ballcat.system.model.dto.SysOrganizationDTO; -import com.hccake.ballcat.system.model.entity.SysOrganization; -import com.hccake.ballcat.system.model.qo.SysOrganizationQO; -import com.hccake.ballcat.system.model.vo.SysOrganizationTree; -import com.hccake.ballcat.system.model.vo.SysOrganizationVO; -import com.hccake.ballcat.system.service.SysOrganizationService; +import com.baiye.operation.annotation.CreateOperationLogging; +import com.baiye.operation.annotation.DeleteOperationLogging; +import com.baiye.operation.annotation.UpdateOperationLogging; +import com.baiye.result.BaseResultCode; +import com.baiye.result.R; +import com.baiye.system.converter.SysOrganizationConverter; +import com.baiye.system.model.dto.SysOrganizationDTO; +import com.baiye.system.model.qo.SysOrganizationQO; +import com.baiye.system.model.vo.SysOrganizationTree; +import com.baiye.system.model.vo.SysOrganizationVO; +import com.baiye.system.service.SysOrganizationService; +import com.baiye.system.model.entity.SysOrganization; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysRoleController.java similarity index 81% rename from ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java rename to ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysRoleController.java index 4b9d288..4fd371d 100644 --- a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java +++ b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysRoleController.java @@ -1,26 +1,26 @@ -package com.hccake.ballcat.system.controller; - -import com.hccake.ballcat.common.log.operation.annotation.CreateOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.DeleteOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.UpdateOperationLogging; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.model.domain.SelectData; -import com.hccake.ballcat.common.model.result.BaseResultCode; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.system.constant.SysRoleConst; -import com.hccake.ballcat.system.converter.SysRoleConverter; -import com.hccake.ballcat.system.model.dto.SysRoleUpdateDTO; -import com.hccake.ballcat.system.model.entity.SysMenu; -import com.hccake.ballcat.system.model.entity.SysRole; -import com.hccake.ballcat.system.model.qo.RoleBindUserQO; -import com.hccake.ballcat.system.model.qo.SysRoleQO; -import com.hccake.ballcat.system.model.vo.RoleBindUserVO; -import com.hccake.ballcat.system.model.vo.SysRolePageVO; -import com.hccake.ballcat.system.service.SysMenuService; -import com.hccake.ballcat.system.service.SysRoleMenuService; -import com.hccake.ballcat.system.service.SysRoleService; -import com.hccake.ballcat.system.service.SysUserRoleService; +package com.baiye.system.controller; + +import com.baiye.operation.annotation.CreateOperationLogging; +import com.baiye.operation.annotation.DeleteOperationLogging; +import com.baiye.operation.annotation.UpdateOperationLogging; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.domain.SelectData; +import com.baiye.result.BaseResultCode; +import com.baiye.result.R; +import com.baiye.system.constant.SysRoleConst; +import com.baiye.system.converter.SysRoleConverter; +import com.baiye.system.model.dto.SysRoleUpdateDTO; +import com.baiye.system.model.entity.SysMenu; +import com.baiye.system.model.entity.SysRole; +import com.baiye.system.model.qo.RoleBindUserQO; +import com.baiye.system.model.qo.SysRoleQO; +import com.baiye.system.model.vo.RoleBindUserVO; +import com.baiye.system.model.vo.SysRolePageVO; +import com.baiye.system.service.SysMenuService; +import com.baiye.system.service.SysRoleMenuService; +import com.baiye.system.service.SysUserRoleService; +import com.baiye.system.service.SysRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysUserController.java b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysUserController.java similarity index 82% rename from ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysUserController.java rename to ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysUserController.java index 9dc2a1f..ffe5dc1 100644 --- a/ad-distribute-system/system-controller/src/main/java/com/hccake/ballcat/system/controller/SysUserController.java +++ b/ad-distribute-system/system-controller/src/main/java/com/baiye/system/controller/SysUserController.java @@ -1,29 +1,32 @@ -package com.hccake.ballcat.system.controller; +package com.baiye.system.controller; -import com.hccake.ballcat.common.core.validation.group.CreateGroup; -import com.hccake.ballcat.common.core.validation.group.UpdateGroup; -import com.hccake.ballcat.common.log.operation.annotation.CreateOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.DeleteOperationLogging; -import com.hccake.ballcat.common.log.operation.annotation.UpdateOperationLogging; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageResult; -import com.hccake.ballcat.common.model.domain.SelectData; -import com.hccake.ballcat.common.model.result.BaseResultCode; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.model.result.SystemResultCode; -import com.hccake.ballcat.system.component.PasswordHelper; -import com.hccake.ballcat.system.constant.SysUserConst; -import com.hccake.ballcat.system.converter.SysUserConverter; -import com.hccake.ballcat.system.model.dto.SysUserDTO; -import com.hccake.ballcat.system.model.dto.SysUserPassDTO; -import com.hccake.ballcat.system.model.dto.SysUserScope; -import com.hccake.ballcat.system.model.entity.SysRole; -import com.hccake.ballcat.system.model.entity.SysUser; -import com.hccake.ballcat.system.model.qo.SysUserQO; -import com.hccake.ballcat.system.model.vo.SysUserInfo; -import com.hccake.ballcat.system.model.vo.SysUserPageVO; -import com.hccake.ballcat.system.service.SysUserRoleService; -import com.hccake.ballcat.system.service.SysUserService; +import com.baiye.constant.DefaultNumberConstants; +import com.baiye.exception.BusinessException; +import com.baiye.system.component.PasswordHelper; +import com.baiye.system.constant.SysUserConst; +import com.baiye.system.converter.SysUserConverter; +import com.baiye.system.model.dto.SysUserDTO; +import com.baiye.system.model.dto.SysUserPassDTO; +import com.baiye.system.model.dto.SysUserScope; +import com.baiye.system.model.entity.SysRole; +import com.baiye.system.model.qo.SysUserQO; +import com.baiye.system.model.vo.SysUserInfo; +import com.baiye.system.model.vo.SysUserPageVO; +import com.baiye.system.service.SysUserRoleService; +import com.baiye.validation.group.CreateGroup; +import com.baiye.validation.group.UpdateGroup; +import com.baiye.operation.annotation.CreateOperationLogging; +import com.baiye.operation.annotation.DeleteOperationLogging; +import com.baiye.operation.annotation.UpdateOperationLogging; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.domain.SelectData; +import com.baiye.result.BaseResultCode; +import com.baiye.result.R; +import com.baiye.result.SystemResultCode; +import com.baiye.security.util.SecurityUtils; +import com.baiye.system.model.entity.SysUser; +import com.baiye.system.service.SysUserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -76,11 +79,22 @@ public class SysUserController { */ @GetMapping("/page") @PreAuthorize("@per.hasPermission('system:user:read')") - @Operation(summary = "分页查询系统用户") + @Operation(summary = "分页查询系统用户(tree树结构)") public R> getUserPage(@Validated PageParam pageParam, SysUserQO qo) { + if (SecurityUtils.getCurrentUserId() != 1) { + throw new BusinessException(BaseResultCode.LOGIC_CHECK_ERROR, "非超级管理员不能查询"); + } + qo.setWhichUserId((long) DefaultNumberConstants.ONE_NUMBER); return R.ok(sysUserService.queryPage(pageParam, qo)); } + @GetMapping("/pageList") + @Operation(summary = "分页查询子用户") + public R> pageList(@Validated PageParam pageParam, SysUserQO qo) { + qo.setWhichUserId(SecurityUtils.getCurrentUserId()); + return R.ok(sysUserService.queryAll(pageParam, qo)); + } + /** * 获取用户Select * @return 用户SelectData diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/constant/SysRoleConst.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/constant/SysRoleConst.java similarity index 89% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/constant/SysRoleConst.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/constant/SysRoleConst.java index 73f8f6c..1d06dd5 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/constant/SysRoleConst.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/constant/SysRoleConst.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.constant; +package com.baiye.system.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/constant/SysUserConst.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/constant/SysUserConst.java similarity index 92% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/constant/SysUserConst.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/constant/SysUserConst.java index b57d2b6..4dc504d 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/constant/SysUserConst.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/constant/SysUserConst.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.constant; +package com.baiye.system.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/constant/SystemRedisKeyConstants.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/constant/SystemRedisKeyConstants.java similarity index 85% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/constant/SystemRedisKeyConstants.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/constant/SystemRedisKeyConstants.java index e6159c8..30fb354 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/constant/SystemRedisKeyConstants.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/constant/SystemRedisKeyConstants.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.constant; +package com.baiye.system.constant; /** * Redis 缓存 Key 的常量类 diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysConfigConverter.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysConfigConverter.java similarity index 72% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysConfigConverter.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysConfigConverter.java index 820be7a..d0d14d6 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysConfigConverter.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysConfigConverter.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.system.converter; +package com.baiye.system.converter; -import com.hccake.ballcat.system.model.entity.SysConfig; -import com.hccake.ballcat.system.model.vo.SysConfigPageVO; +import com.baiye.system.model.vo.SysConfigPageVO; +import com.baiye.system.model.entity.SysConfig; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysDictConverter.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysDictConverter.java similarity index 71% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysDictConverter.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysDictConverter.java index 58e53b5..06adf1d 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysDictConverter.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysDictConverter.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.system.converter; +package com.baiye.system.converter; -import com.hccake.ballcat.system.model.entity.SysDict; -import com.hccake.ballcat.system.model.vo.SysDictPageVO; +import com.baiye.system.model.vo.SysDictPageVO; +import com.baiye.system.model.entity.SysDict; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysDictItemConverter.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysDictItemConverter.java similarity index 72% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysDictItemConverter.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysDictItemConverter.java index 802a9e0..f0d1661 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysDictItemConverter.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysDictItemConverter.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.system.converter; +package com.baiye.system.converter; -import com.hccake.ballcat.system.model.dto.SysDictItemDTO; -import com.hccake.ballcat.system.model.entity.SysDictItem; -import com.hccake.ballcat.system.model.vo.DictItemVO; -import com.hccake.ballcat.system.model.vo.SysDictItemPageVO; +import com.baiye.system.model.dto.SysDictItemDTO; +import com.baiye.system.model.entity.SysDictItem; +import com.baiye.system.model.vo.DictItemVO; +import com.baiye.system.model.vo.SysDictItemPageVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysMenuConverter.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysMenuConverter.java similarity index 74% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysMenuConverter.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysMenuConverter.java index 6bf6cc5..472a453 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysMenuConverter.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysMenuConverter.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.system.converter; - -import com.hccake.ballcat.system.model.dto.SysMenuCreateDTO; -import com.hccake.ballcat.system.model.dto.SysMenuUpdateDTO; -import com.hccake.ballcat.system.model.entity.SysMenu; -import com.hccake.ballcat.system.model.vo.SysMenuGrantVO; -import com.hccake.ballcat.system.model.vo.SysMenuRouterVO; -import com.hccake.ballcat.system.model.vo.SysMenuPageVO; +package com.baiye.system.converter; + +import com.baiye.system.model.dto.SysMenuCreateDTO; +import com.baiye.system.model.dto.SysMenuUpdateDTO; +import com.baiye.system.model.entity.SysMenu; +import com.baiye.system.model.vo.SysMenuGrantVO; +import com.baiye.system.model.vo.SysMenuRouterVO; +import com.baiye.system.model.vo.SysMenuPageVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysOrganizationConverter.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysOrganizationConverter.java similarity index 73% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysOrganizationConverter.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysOrganizationConverter.java index 3a344c3..8357ed3 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysOrganizationConverter.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysOrganizationConverter.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.system.converter; +package com.baiye.system.converter; -import com.hccake.ballcat.system.model.dto.SysOrganizationDTO; -import com.hccake.ballcat.system.model.entity.SysOrganization; -import com.hccake.ballcat.system.model.vo.SysOrganizationTree; -import com.hccake.ballcat.system.model.vo.SysOrganizationVO; +import com.baiye.system.model.dto.SysOrganizationDTO; +import com.baiye.system.model.entity.SysOrganization; +import com.baiye.system.model.vo.SysOrganizationTree; +import com.baiye.system.model.vo.SysOrganizationVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysRoleConverter.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysRoleConverter.java similarity index 71% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysRoleConverter.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysRoleConverter.java index 6103ccf..0bf5b0e 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysRoleConverter.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysRoleConverter.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.system.converter; +package com.baiye.system.converter; -import com.hccake.ballcat.system.model.dto.SysRoleUpdateDTO; -import com.hccake.ballcat.system.model.entity.SysRole; -import com.hccake.ballcat.system.model.vo.SysRolePageVO; +import com.baiye.system.model.entity.SysRole; +import com.baiye.system.model.dto.SysRoleUpdateDTO; +import com.baiye.system.model.vo.SysRolePageVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysUserConverter.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysUserConverter.java similarity index 74% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysUserConverter.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysUserConverter.java index 868c33f..40ba51b 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/converter/SysUserConverter.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/converter/SysUserConverter.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.system.converter; +package com.baiye.system.converter; -import com.hccake.ballcat.system.model.dto.SysUserDTO; -import com.hccake.ballcat.system.model.entity.SysUser; -import com.hccake.ballcat.system.model.vo.SysUserInfo; -import com.hccake.ballcat.system.model.vo.SysUserPageVO; +import com.baiye.system.model.dto.SysUserDTO; +import com.baiye.system.model.entity.SysUser; +import com.baiye.system.model.vo.SysUserInfo; +import com.baiye.system.model.vo.SysUserPageVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/enums/SysMenuType.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/enums/SysMenuType.java similarity index 87% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/enums/SysMenuType.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/enums/SysMenuType.java index 86e1cd3..6b7f97d 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/enums/SysMenuType.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/enums/SysMenuType.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.enums; +package com.baiye.system.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/enums/TagEnum.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/enums/TagEnum.java similarity index 84% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/enums/TagEnum.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/enums/TagEnum.java index 442763a..bb01659 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/enums/TagEnum.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/enums/TagEnum.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.enums; +package com.baiye.system.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/event/DictChangeEvent.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/event/DictChangeEvent.java similarity index 90% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/event/DictChangeEvent.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/event/DictChangeEvent.java index 0f95455..35b2a3a 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/event/DictChangeEvent.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/event/DictChangeEvent.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.event; +package com.baiye.system.event; import lombok.Getter; import lombok.ToString; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/event/UserCreatedEvent.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/event/UserCreatedEvent.java similarity index 79% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/event/UserCreatedEvent.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/event/UserCreatedEvent.java index 44e97ef..1b32cb5 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/event/UserCreatedEvent.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/event/UserCreatedEvent.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.system.event; +package com.baiye.system.event; -import com.hccake.ballcat.system.model.entity.SysUser; +import com.baiye.system.model.entity.SysUser; import lombok.Getter; import lombok.ToString; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/event/UserOrganizationChangeEvent.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/event/UserOrganizationChangeEvent.java similarity index 89% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/event/UserOrganizationChangeEvent.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/event/UserOrganizationChangeEvent.java index 69e4e51..dcaea2b 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/event/UserOrganizationChangeEvent.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/event/UserOrganizationChangeEvent.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.event; +package com.baiye.system.event; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/OrganizationMoveChildParam.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/OrganizationMoveChildParam.java similarity index 93% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/OrganizationMoveChildParam.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/OrganizationMoveChildParam.java index 71a7980..4cf2464 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/OrganizationMoveChildParam.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/OrganizationMoveChildParam.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.dto; +package com.baiye.system.model.dto; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysDictItemDTO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysDictItemDTO.java similarity index 87% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysDictItemDTO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysDictItemDTO.java index 548dac6..1b3c889 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysDictItemDTO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysDictItemDTO.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.system.model.dto; +package com.baiye.system.model.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import com.hccake.ballcat.common.core.validation.constraints.OneOfInts; -import com.hccake.ballcat.common.core.validation.group.CreateGroup; -import com.hccake.ballcat.common.core.validation.group.UpdateGroup; +import com.baiye.validation.constraints.OneOfInts; +import com.baiye.validation.group.CreateGroup; +import com.baiye.validation.group.UpdateGroup; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysMenuCreateDTO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysMenuCreateDTO.java similarity index 95% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysMenuCreateDTO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysMenuCreateDTO.java index 432c81c..75e8d53 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysMenuCreateDTO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysMenuCreateDTO.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.system.model.dto; +package com.baiye.system.model.dto; -import com.hccake.ballcat.common.i18n.I18nMessage; +import com.baiye.I18nMessage; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysMenuUpdateDTO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysMenuUpdateDTO.java similarity index 97% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysMenuUpdateDTO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysMenuUpdateDTO.java index db1d7d3..171f135 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysMenuUpdateDTO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysMenuUpdateDTO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.dto; +package com.baiye.system.model.dto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysOrganizationDTO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysOrganizationDTO.java similarity index 93% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysOrganizationDTO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysOrganizationDTO.java index c7b4627..311c179 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysOrganizationDTO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysOrganizationDTO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.dto; +package com.baiye.system.model.dto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysRoleUpdateDTO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysRoleUpdateDTO.java similarity index 94% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysRoleUpdateDTO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysRoleUpdateDTO.java index df79fe3..c205e7a 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysRoleUpdateDTO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysRoleUpdateDTO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.dto; +package com.baiye.system.model.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysUserDTO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysUserDTO.java similarity index 84% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysUserDTO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysUserDTO.java index 63e56a0..381cc8e 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysUserDTO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysUserDTO.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.system.model.dto; +package com.baiye.system.model.dto; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hccake.ballcat.common.core.validation.group.CreateGroup; -import com.hccake.ballcat.common.core.validation.group.UpdateGroup; -import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonRegexDesensitize; +import com.baiye.validation.group.CreateGroup; +import com.baiye.validation.group.UpdateGroup; +import com.baiye.enums.RegexDesensitizationTypeEnum; +import com.baiye.json.annotation.JsonRegexDesensitize; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.hibernate.validator.constraints.Range; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysUserPassDTO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysUserPassDTO.java similarity index 78% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysUserPassDTO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysUserPassDTO.java index 46fe152..f05e543 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysUserPassDTO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysUserPassDTO.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.system.model.dto; +package com.baiye.system.model.dto; -import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonRegexDesensitize; +import com.baiye.enums.RegexDesensitizationTypeEnum; +import com.baiye.json.annotation.JsonRegexDesensitize; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysUserScope.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysUserScope.java similarity index 84% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysUserScope.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysUserScope.java index 3fb52ed..04718f9 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/SysUserScope.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/SysUserScope.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.dto; +package com.baiye.system.model.dto; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/UserInfoDTO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/UserInfoDTO.java similarity index 78% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/UserInfoDTO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/UserInfoDTO.java index 53c5381..f73e05b 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/dto/UserInfoDTO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/dto/UserInfoDTO.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.system.model.dto; +package com.baiye.system.model.dto; -import com.hccake.ballcat.system.model.entity.SysMenu; -import com.hccake.ballcat.system.model.entity.SysRole; -import com.hccake.ballcat.system.model.entity.SysUser; +import com.baiye.system.model.entity.SysMenu; +import com.baiye.system.model.entity.SysRole; +import com.baiye.system.model.entity.SysUser; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysConfig.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysConfig.java similarity index 89% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysConfig.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysConfig.java index 5145b79..68b9479 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysConfig.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysConfig.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.system.model.entity; +package com.baiye.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.ballcat.common.model.entity.LogicDeletedBaseEntity; +import com.baiye.entity.LogicDeletedBaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDict.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysDict.java similarity index 89% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDict.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysDict.java index c712bf3..d830bd9 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDict.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysDict.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.system.model.entity; +package com.baiye.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.ballcat.common.model.entity.LogicDeletedBaseEntity; +import com.baiye.entity.LogicDeletedBaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDictItem.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysDictItem.java similarity index 92% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDictItem.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysDictItem.java index 244ad10..9cc1ee9 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysDictItem.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysDictItem.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.system.model.entity; +package com.baiye.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import com.hccake.ballcat.common.model.entity.LogicDeletedBaseEntity; +import com.baiye.entity.LogicDeletedBaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysMenu.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysMenu.java similarity index 95% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysMenu.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysMenu.java index 53a4ed7..6b2acd8 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysMenu.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysMenu.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.system.model.entity; +package com.baiye.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.ballcat.common.model.entity.LogicDeletedBaseEntity; +import com.baiye.entity.LogicDeletedBaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysOrganization.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysOrganization.java similarity index 91% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysOrganization.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysOrganization.java index 60cc83f..2414b0a 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysOrganization.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysOrganization.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.system.model.entity; +package com.baiye.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.ballcat.common.model.entity.LogicDeletedBaseEntity; +import com.baiye.entity.LogicDeletedBaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRole.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysRole.java similarity index 92% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRole.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysRole.java index 502875c..5e4b2c9 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRole.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysRole.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.system.model.entity; +package com.baiye.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.ballcat.common.model.entity.LogicDeletedBaseEntity; +import com.baiye.entity.LogicDeletedBaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRoleMenu.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysRoleMenu.java similarity index 93% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRoleMenu.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysRoleMenu.java index 5a26e72..f45adbb 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysRoleMenu.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.entity; +package com.baiye.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysUser.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysUser.java similarity index 87% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysUser.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysUser.java index e4d0384..30eda30 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysUser.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysUser.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.system.model.entity; +package com.baiye.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.ballcat.common.model.entity.LogicDeletedBaseEntity; -import com.hccake.extend.mybatis.plus.alias.TableAlias; +import com.baiye.entity.LogicDeletedBaseEntity; +import com.baiye.extend.mybatis.plus.alias.TableAlias; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -96,4 +96,10 @@ public class SysUser extends LogicDeletedBaseEntity { @Schema(title = "1:系统用户， 2：客户用户") private Integer type; + /** + * 创建者(父ID) + */ + @Schema(title = "创建者(父ID)") + private Long whichUserId; + } diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysUserRole.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysUserRole.java similarity index 85% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysUserRole.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysUserRole.java index 0819965..d88fd9b 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/entity/SysUserRole.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/entity/SysUserRole.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.system.model.entity; +package com.baiye.system.model.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.extend.mybatis.plus.alias.TableAlias; +import com.baiye.extend.mybatis.plus.alias.TableAlias; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/RoleBindUserQO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/RoleBindUserQO.java similarity index 94% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/RoleBindUserQO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/RoleBindUserQO.java index 50e9276..295f358 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/RoleBindUserQO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/RoleBindUserQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.qo; +package com.baiye.system.model.qo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysConfigQO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysConfigQO.java similarity index 93% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysConfigQO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysConfigQO.java index 9c15683..8e1c143 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysConfigQO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysConfigQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.qo; +package com.baiye.system.model.qo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysDictQO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysDictQO.java similarity index 92% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysDictQO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysDictQO.java index 46167b0..173cfb2 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysDictQO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysDictQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.qo; +package com.baiye.system.model.qo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysMenuQO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysMenuQO.java similarity index 94% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysMenuQO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysMenuQO.java index a48bd2d..bda1ad8 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysMenuQO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysMenuQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.qo; +package com.baiye.system.model.qo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysOrganizationQO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysOrganizationQO.java similarity index 91% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysOrganizationQO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysOrganizationQO.java index d9b5477..1c60241 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysOrganizationQO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysOrganizationQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.qo; +package com.baiye.system.model.qo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysRoleQO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysRoleQO.java similarity index 93% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysRoleQO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysRoleQO.java index 0f0e031..42b5ac7 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysRoleQO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysRoleQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.qo; +package com.baiye.system.model.qo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysUserQO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysUserQO.java similarity index 90% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysUserQO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysUserQO.java index 5b82bed..5bcf8a5 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/qo/SysUserQO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/qo/SysUserQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.qo; +package com.baiye.system.model.qo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; @@ -66,4 +66,10 @@ public class SysUserQO { @Parameter(description = "结束时间") private String endTime; + /** + * 创建者(父ID) + */ + @Parameter(description = "创建者(父ID)") + private Long whichUserId; + } diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/DictDataVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/DictDataVO.java similarity index 92% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/DictDataVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/DictDataVO.java index c3f17fb..46078ab 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/DictDataVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/DictDataVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/DictItemVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/DictItemVO.java similarity index 94% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/DictItemVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/DictItemVO.java index 48e63cf..565eee6 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/DictItemVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/DictItemVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/RoleBindUserVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/RoleBindUserVO.java similarity index 94% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/RoleBindUserVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/RoleBindUserVO.java index 330341e..5314f3b 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/RoleBindUserVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/RoleBindUserVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysConfigPageVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysConfigPageVO.java similarity index 95% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysConfigPageVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysConfigPageVO.java index 049b79f..948e50c 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysConfigPageVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysConfigPageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysDictItemPageVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysDictItemPageVO.java similarity index 96% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysDictItemPageVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysDictItemPageVO.java index 5ff923e..3ee1677 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysDictItemPageVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysDictItemPageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysDictPageVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysDictPageVO.java similarity index 95% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysDictPageVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysDictPageVO.java index a012d2e..7dbb9ee 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysDictPageVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysDictPageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysMenuGrantVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysMenuGrantVO.java similarity index 83% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysMenuGrantVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysMenuGrantVO.java index 65d39ec..de01257 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysMenuGrantVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysMenuGrantVO.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; -import com.hccake.ballcat.common.i18n.I18nClass; -import com.hccake.ballcat.common.i18n.I18nField; +import com.baiye.I18nClass; +import com.baiye.I18nField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysMenuPageVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysMenuPageVO.java similarity index 93% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysMenuPageVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysMenuPageVO.java index bac517d..0976c37 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysMenuPageVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysMenuPageVO.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; -import com.hccake.ballcat.common.i18n.I18nClass; -import com.hccake.ballcat.common.i18n.I18nField; +import com.baiye.I18nClass; +import com.baiye.I18nField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysMenuRouterVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysMenuRouterVO.java similarity index 91% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysMenuRouterVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysMenuRouterVO.java index c41164a..b8a680d 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysMenuRouterVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysMenuRouterVO.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; -import com.hccake.ballcat.common.i18n.I18nClass; -import com.hccake.ballcat.common.i18n.I18nField; +import com.baiye.I18nClass; +import com.baiye.I18nField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysOrganizationTree.java similarity index 94% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysOrganizationTree.java index dcd5d90..c716821 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationTree.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysOrganizationTree.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; -import com.hccake.ballcat.common.util.tree.TreeNode; +import com.baiye.util.tree.TreeNode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysOrganizationVO.java similarity index 90% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysOrganizationVO.java index 7d2a864..6e841d7 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysOrganizationVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysOrganizationVO.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; -import com.hccake.ballcat.common.model.entity.BaseEntity; +import com.baiye.entity.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysRolePageVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysRolePageVO.java similarity index 95% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysRolePageVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysRolePageVO.java index fbe4ea5..8a28dc4 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysRolePageVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysRolePageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysUserInfo.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysUserInfo.java similarity index 96% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysUserInfo.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysUserInfo.java index ab6c2a0..0391f6b 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysUserInfo.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysUserInfo.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysUserPageVO.java b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysUserPageVO.java similarity index 89% rename from ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysUserPageVO.java rename to ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysUserPageVO.java index 6d4e453..bb815d3 100644 --- a/ad-distribute-system/system-model/src/main/java/com/hccake/ballcat/system/model/vo/SysUserPageVO.java +++ b/ad-distribute-system/system-model/src/main/java/com/baiye/system/model/vo/SysUserPageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.system.model.vo; +package com.baiye.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.List; /** * 系统用户表 @@ -69,6 +70,12 @@ public class SysUserPageVO implements Serializable { @Schema(title = "用户类型：1-系统用户，2-客户用户") private Integer type; + /** + * 创建者(父ID) + */ + @Schema(title = "创建者(父ID)") + private Long whichUserId; + /** * 组织机构ID */ @@ -93,4 +100,6 @@ public class SysUserPageVO implements Serializable { @Schema(title = "更新时间") private LocalDateTime updateTime; + private List children; + } diff --git a/admin/src/main/java/com/baiye/captcha/TianaiCaptchaEndpoint.java b/admin/src/main/java/com/baiye/captcha/TianaiCaptchaEndpoint.java index fe9c86b..f748f05 100644 --- a/admin/src/main/java/com/baiye/captcha/TianaiCaptchaEndpoint.java +++ b/admin/src/main/java/com/baiye/captcha/TianaiCaptchaEndpoint.java @@ -5,6 +5,7 @@ import cloud.tianai.captcha.spring.application.ImageCaptchaApplication; import cloud.tianai.captcha.spring.vo.CaptchaResponse; import cloud.tianai.captcha.spring.vo.ImageCaptchaVO; import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/captcha/tianai") @RequiredArgsConstructor +@Tag(name = "验证码管理") public class TianaiCaptchaEndpoint { private final ImageCaptchaApplication imageCaptchaApplication; diff --git a/admin/src/main/java/com/baiye/constant/UploadTemplateHeadConstant.java b/admin/src/main/java/com/baiye/constant/UploadTemplateHeadConstant.java new file mode 100644 index 0000000..eaf3c6d --- /dev/null +++ b/admin/src/main/java/com/baiye/constant/UploadTemplateHeadConstant.java @@ -0,0 +1,16 @@ +package com.baiye.constant; + +/** + * 上传文件模板头信息常量 + */ +public class UploadTemplateHeadConstant { + + public static final String HEAD_NID = "手机号"; + + public static final String HEAD_ORIGIN = "渠道来源"; + + public static final String HEAD_REMARK = "备注"; + + public static final String HEAD_DATE = "日期(****/**/** 00:00:00)"; + +} diff --git a/admin/src/main/java/com/baiye/easyexcel/dto/ClueListenerDto.java b/admin/src/main/java/com/baiye/easyexcel/dto/ClueListenerDto.java index 80edb8d..79aa1fa 100644 --- a/admin/src/main/java/com/baiye/easyexcel/dto/ClueListenerDto.java +++ b/admin/src/main/java/com/baiye/easyexcel/dto/ClueListenerDto.java @@ -1,24 +1,35 @@ package com.baiye.easyexcel.dto; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import lombok.*; import java.util.Date; +import java.util.List; +import java.util.Map; @Getter @Setter +@AllArgsConstructor +@NoArgsConstructor public class ClueListenerDto { - @ExcelProperty(value = "手机号", index = 0) + @ExcelProperty(value = "手机号") private String nid; - @ExcelProperty(value = "渠道来源", index = 1) + @ExcelProperty(value = "渠道来源") private String originName; - @ExcelProperty(value = "备注", index = 2) + @ExcelProperty(value = "备注") private String remark; - @ExcelProperty(value = "日期(****/**/** 00:00:00)", index = 3) + @ExcelProperty(value = "日期(****/**/** 00:00:00)") private Date clueTime; + // 存储不确定列数据 + // private Map dynamicColumns; + // private List dynamicColumns; + @ExcelIgnore + private Map dynamicColumns; + } diff --git a/admin/src/main/java/com/baiye/easyexcel/listener/CheckClueListenerHead.java b/admin/src/main/java/com/baiye/easyexcel/listener/CheckClueListenerHead.java new file mode 100644 index 0000000..128d440 --- /dev/null +++ b/admin/src/main/java/com/baiye/easyexcel/listener/CheckClueListenerHead.java @@ -0,0 +1,51 @@ +package com.baiye.easyexcel.listener; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.baiye.constant.UploadTemplateHeadConstant; +import com.baiye.easyexcel.dto.ClueListenerDto; +import com.baiye.exception.BusinessException; +import com.baiye.result.BaseResultCode; +import lombok.extern.slf4j.Slf4j; + +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 校验上传文件模板头信息 + * + * @Author YQY + * @Date 2023/8/2 + */ +@Slf4j +public class CheckClueListenerHead extends AnalysisEventListener { + + @Override + public void invokeHead(Map> headMap, AnalysisContext context) { + Set collect = headMap.values().stream().map(ReadCellData::getStringValue).collect(Collectors.toSet()); + if (!collect.contains(UploadTemplateHeadConstant.HEAD_NID)) { + throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR, "文件模板中缺少 手机号 头信息的列,请下载基础模板"); + } + if (!collect.contains(UploadTemplateHeadConstant.HEAD_ORIGIN)) { + throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR, "文件模板中缺少 渠道来源 头信息的列,请下载基础模板"); + } + if (!collect.contains(UploadTemplateHeadConstant.HEAD_REMARK)) { + throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR, "文件模板中缺少 备注 头信息的列,请下载基础模板"); + } + if (!collect.contains(UploadTemplateHeadConstant.HEAD_DATE)) { + throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR, + "文件模板中缺少 日期(****/**/** 00:00:00) 头信息的列,请下载基础模板"); + } + } + + @Override + public void invoke(ClueListenerDto clueListenerDto, AnalysisContext analysisContext) { + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + } + +} diff --git a/admin/src/main/java/com/baiye/easyexcel/listener/ClueListener.java b/admin/src/main/java/com/baiye/easyexcel/listener/ClueListener.java index fb2069b..ca5329b 100644 --- a/admin/src/main/java/com/baiye/easyexcel/listener/ClueListener.java +++ b/admin/src/main/java/com/baiye/easyexcel/listener/ClueListener.java @@ -1,20 +1,25 @@ package com.baiye.easyexcel.listener; import cn.hutool.core.collection.CollUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import com.baiye.easyexcel.dto.ClueListenerDto; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.baiye.constant.UploadTemplateHeadConstant; import com.baiye.modules.distribute.entity.ClueEntity; import com.baiye.modules.distribute.entity.ClueRecordEntity; import com.baiye.modules.distribute.service.ClueService; -import org.springframework.beans.BeanUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; -import java.util.ArrayList; -import java.util.List; +import java.util.*; -public class ClueListener extends AnalysisEventListener { +@Slf4j +public class ClueListener extends AnalysisEventListener> { - public final List rows = new ArrayList<>(); + public final List rows = new ArrayList<>(); + + public final LinkedList headInfo = new LinkedList<>(); /** * 监听类不被spring管理，选择手动注入service @@ -32,8 +37,34 @@ public class ClueListener extends AnalysisEventListener { * 每条数据都会回调此函数，3000条处理一次 */ @Override - public void invoke(ClueListenerDto clueListenerDto, AnalysisContext analysisContext) { - rows.add(clueListenerDto); + public void invoke(Map data, AnalysisContext context) { + ClueEntity clueEntity = new ClueEntity(); + Map map = new HashMap<>(); + // 动态解析excel列 + for (int i = 0; i < headInfo.size(); i++) { + String param = data.get(i); + switch (headInfo.get(i)) { + case UploadTemplateHeadConstant.HEAD_NID: + clueEntity.setNid(param); + break; + case UploadTemplateHeadConstant.HEAD_ORIGIN: + clueEntity.setOriginName(param); + break; + case UploadTemplateHeadConstant.HEAD_REMARK: + clueEntity.setRemark(param); + break; + case UploadTemplateHeadConstant.HEAD_DATE: + clueEntity.setClueTime(param); + break; + default: + if (StringUtils.isEmpty(param)) + param = ""; + map.put(headInfo.get(i), param); + } + } + clueEntity.setOtherClue(JSONUtil.toJsonStr(map)); + rows.add(clueEntity); + // 保存 if (rows.size() >= 3000) { saveData(); rows.clear(); @@ -48,20 +79,23 @@ public class ClueListener extends AnalysisEventListener { if (CollUtil.isNotEmpty(rows)) saveData(); rows.clear(); + headInfo.clear(); + } + + /** + * 读取表头 + */ + @Override + public void invokeHead(Map> headMap, AnalysisContext context) { + headMap.values().forEach(vs -> headInfo.add(vs.getStringValue())); } /** * 插入数据库 */ private void saveData() { - List clues = new ArrayList<>(); - for (ClueListenerDto clueListenerDto : rows) { - ClueEntity clueEntity = new ClueEntity(); - BeanUtils.copyProperties(clueListenerDto, clueEntity); - clueEntity.setClueRecordId(clueRecordEntity.getClueRecordId()); - clues.add(clueEntity); - } - clueService.clueFileUploadSaveAll(clues); + rows.forEach(row -> row.setClueRecordId(clueRecordEntity.getClueRecordId())); + clueService.clueFileUploadSaveAll(rows); } } diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/ClueController.java index aafab27..1bd7b15 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueController.java +++ b/admin/src/main/java/com/baiye/modules/distribute/controller/ClueController.java @@ -1,16 +1,19 @@ package com.baiye.modules.distribute.controller; +import com.alibaba.excel.EasyExcel; import com.baiye.modules.distribute.service.ClueService; -import com.hccake.ballcat.common.model.result.R; +import com.baiye.result.R; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; + /** * @Author YQY * @Date 2023/8/1 @@ -24,10 +27,22 @@ public class ClueController { private final ClueService clueService; @PostMapping("/fileUpload") - @Operation(summary = "文件上传资源", description = "文件上传资源") - public R clueFileUpload(@RequestParam("fileList") MultipartFile file) { - clueService.clueFileUpload(file); - return R.ok(); + @Operation(summary = "文件上传资源(不读取)") + public R clueFileUpload(@RequestParam("file") MultipartFile file) { + return R.ok(clueService.clueFileUpload(file)); + } + + @GetMapping("/export") + @Operation(summary = "导出模板") + public void exportExcelTemplate(HttpServletResponse response) { + try (InputStream inputStream = getClass().getResourceAsStream("/file/template.xlsx")) { + response.setHeader("Content-Disposition", "attachment; filename=\"template.xlsx\""); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + EasyExcel.write(response.getOutputStream()).withTemplate(inputStream).sheet().doWrite(new ArrayList<>()); + } + catch (IOException e) { + e.printStackTrace(); + } } } diff --git a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueRecordController.java b/admin/src/main/java/com/baiye/modules/distribute/controller/ClueRecordController.java index 43a0432..79f1d71 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/controller/ClueRecordController.java +++ b/admin/src/main/java/com/baiye/modules/distribute/controller/ClueRecordController.java @@ -1,10 +1,17 @@ package com.baiye.modules.distribute.controller; import com.baiye.modules.distribute.service.ClueRecordService; +import com.baiye.modules.distribute.vo.ClueRecordVO; +import com.baiye.qo.ClueRecordQo; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.result.BaseResultCode; +import com.baiye.result.R; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * @Author YQY @@ -12,10 +19,23 @@ import org.springframework.web.bind.annotation.RestController; */ @RequiredArgsConstructor @RestController -@Tag(name = "资源管理") +@Tag(name = "文件上传记录API") @RequestMapping("/clueRecord") public class ClueRecordController { private final ClueRecordService clueRecordService; + @GetMapping("/page") + @Operation(summary = "分页查询导入记录") + public R> getClueRecordPage(@Validated PageParam pageParam, ClueRecordQo qo) { + return R.ok(clueRecordService.queryPage(pageParam, qo)); + } + + @DeleteMapping("/{id}") + @Operation(summary = "通过id删除记录并删除本地文件") + public R deleteByUserId(@PathVariable("id") Long clueRecordId) { + return clueRecordService.deleteByUserId(clueRecordId) ? R.ok() + : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除文件失败"); + } + } diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java index 139289d..487fa5a 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java +++ b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java @@ -2,12 +2,10 @@ package com.baiye.modules.distribute.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.ballcat.common.model.entity.BaseEntity; +import com.baiye.entity.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.Date; - /** * @Author YQY * @Date 2023/8/1 @@ -32,7 +30,7 @@ public class ClueEntity extends BaseEntity { private String nid; @Schema(title = "线索时间") - private Date clueTime; + private String clueTime; @Schema(title = "线索备注") private String remark; @@ -40,4 +38,7 @@ public class ClueEntity extends BaseEntity { @Schema(title = "记录ID") private Long clueRecordId; + // @TableField(exist = false) + private String otherClue; + } diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueRecordEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueRecordEntity.java index 9cff8a7..adbbb89 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueRecordEntity.java +++ b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueRecordEntity.java @@ -2,9 +2,8 @@ package com.baiye.modules.distribute.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.hccake.ballcat.common.model.entity.BaseEntity; +import com.baiye.entity.BaseEntity; +import com.baiye.extend.mybatis.plus.alias.TableAlias; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -19,6 +18,7 @@ import lombok.ToString; @ToString @TableName("tb_clue_record") @Schema(title = "线索上传文件记录") +@TableAlias("cr") public class ClueRecordEntity extends BaseEntity { private static final long serialVersionUID = 1L; @@ -31,7 +31,6 @@ public class ClueRecordEntity extends BaseEntity { private Integer status = 0; @Schema(title = "任务id") - @JsonSerialize(using = ToStringSerializer.class) private Long taskId; @Schema(title = "上传文件名") diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java index cca73cf..dd868c7 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java @@ -1,7 +1,7 @@ package com.baiye.modules.distribute.mapper; import com.baiye.modules.distribute.entity.ClueEntity; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; public interface ClueMapper extends ExtendMapper { diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueRecordMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueRecordMapper.java index 1bdb197..bb3838a 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueRecordMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueRecordMapper.java @@ -1,8 +1,35 @@ package com.baiye.modules.distribute.mapper; import com.baiye.modules.distribute.entity.ClueRecordEntity; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.modules.distribute.vo.ClueRecordVO; +import com.baiye.qo.ClueRecordQo; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; +import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.extend.mybatis.plus.toolkit.WrappersX; +import org.apache.ibatis.annotations.Param; public interface ClueRecordMapper extends ExtendMapper { + default PageResult queryPage(PageParam pageParam, ClueRecordQo qo) { + IPage page = this.prodPage(pageParam); + + LambdaAliasQueryWrapperX wrapperX = WrappersX.lambdaAliasQueryX(ClueRecordEntity.class); + wrapperX.likeIfPresent(ClueRecordEntity::getOldFileName, qo.getOldFileName()); + + if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { + wrapperX.between(ClueRecordEntity::getCreateTime, qo.getStartTime(), qo.getEndTime()); + } + this.selectByPage(page, wrapperX); + return new PageResult<>(page.getRecords(), page.getTotal()); + } + + IPage selectByPage(IPage page, + @Param(Constants.WRAPPER) Wrapper wrapper); + } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/ClueRecordService.java b/admin/src/main/java/com/baiye/modules/distribute/service/ClueRecordService.java index 55c35d1..e13c840 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/ClueRecordService.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/ClueRecordService.java @@ -1,8 +1,22 @@ package com.baiye.modules.distribute.service; import com.baiye.modules.distribute.entity.ClueRecordEntity; -import com.hccake.extend.mybatis.plus.service.ExtendService; +import com.baiye.modules.distribute.vo.ClueRecordVO; +import com.baiye.qo.ClueRecordQo; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.service.ExtendService; public interface ClueRecordService extends ExtendService { + /** + * 分页查询导入记录 + */ + PageResult queryPage(PageParam pageParam, ClueRecordQo qo); + + /** + * 通过id删除记录并删除本地文件 + */ + boolean deleteByUserId(Long clueRecordId); + } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java b/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java index 402123a..5a26391 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java @@ -1,17 +1,18 @@ package com.baiye.modules.distribute.service; import com.baiye.modules.distribute.entity.ClueEntity; -import com.hccake.extend.mybatis.plus.service.ExtendService; +import com.baiye.extend.mybatis.plus.service.ExtendService; import org.springframework.web.multipart.MultipartFile; import java.util.List; +import java.util.Map; public interface ClueService extends ExtendService { /** * 文件上传资源 */ - void clueFileUpload(MultipartFile file); + Map clueFileUpload(MultipartFile file); /** * 批量上传 插入资源 diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueRecordServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueRecordServiceImpl.java index 025313b..13a8b8b 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueRecordServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueRecordServiceImpl.java @@ -3,10 +3,17 @@ package com.baiye.modules.distribute.service.impl; import com.baiye.modules.distribute.entity.ClueRecordEntity; import com.baiye.modules.distribute.mapper.ClueRecordMapper; import com.baiye.modules.distribute.service.ClueRecordService; -import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.modules.distribute.vo.ClueRecordVO; +import com.baiye.qo.ClueRecordQo; +import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import com.baiye.util.FileUtil; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @Author YQY @@ -18,4 +25,17 @@ import org.springframework.stereotype.Service; public class ClueRecordServiceImpl extends ExtendServiceImpl implements ClueRecordService { + @Override + public PageResult queryPage(PageParam pageParam, ClueRecordQo qo) { + return baseMapper.queryPage(pageParam, qo); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean deleteByUserId(Long clueRecordId) { + ClueRecordEntity clueRecordEntity = baseMapper.selectById(clueRecordId); + FileUtil.del(clueRecordEntity.getUrl()); + return SqlHelper.retBool(baseMapper.deleteById(clueRecordId)); + } + } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java index 5f1d640..c894d02 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java @@ -9,10 +9,10 @@ import com.baiye.modules.distribute.mapper.ClueRecordMapper; import com.baiye.modules.distribute.service.ClueService; import com.baiye.task.SyncUploadFileTask; import com.baiye.utils.ClueFileTestingUtil; -import com.hccake.ballcat.system.properties.FileProperties; -import com.hccake.ballcat.common.core.util.FileUtil; -import com.hccake.ballcat.common.core.util.MobileUtil; -import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.system.properties.FileProperties; +import com.baiye.util.FileUtil; +import com.baiye.util.MobileUtil; +import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -21,10 +21,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -43,9 +40,9 @@ public class ClueServiceImpl extends ExtendServiceImpl i private final SyncUploadFileTask syncUploadFileTask; @Override - public void clueFileUpload(MultipartFile multipartFile) { + public Map clueFileUpload(MultipartFile multipartFile) { // 检测文件的内容格式 - ClueFileTestingUtil.testingExcel(multipartFile); + List excelHeadList = ClueFileTestingUtil.testingExcel(multipartFile); // 保存文件 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); String path = properties.getPath().getClueFilePath() + dateFormat.format(new Date()) @@ -58,8 +55,14 @@ public class ClueServiceImpl extends ExtendServiceImpl i clueRecordEntity.setOldFileName(multipartFile.getOriginalFilename()); clueRecordEntity.setUrl(Objects.requireNonNull(file).getPath()); clueRecordMapper.insert(clueRecordEntity); + + Map returnMap = new HashMap<>(); + returnMap.put("excelHead", excelHeadList); + returnMap.put("clueRecordId", clueRecordEntity.getClueRecordId()); + // 异步读取文件 - syncUploadFileTask.clueUpload(clueRecordEntity, this); + // syncUploadFileTask.clueUpload(clueRecordEntity, this); + return returnMap; } @Override diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/ClueRecordVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/ClueRecordVO.java new file mode 100644 index 0000000..ca17a4e --- /dev/null +++ b/admin/src/main/java/com/baiye/modules/distribute/vo/ClueRecordVO.java @@ -0,0 +1,46 @@ +package com.baiye.modules.distribute.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @Author YQY + * @Date 2023/8/2 + */ +@Data +@Schema(title = "导入文件记录VO") +public class ClueRecordVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @Schema(title = "线索上传文件记录ID") + private Long clueRecordId; + + @Schema(title = "上传状态 0:上传中 1:上传失败 2:上传成功") + private Integer status; + + @Schema(title = "任务id") + private Long taskId; + + @Schema(title = "上传文件名") + private String oldFileName; + + @Schema(title = "存入路径") + private String url; + + @Schema(title = "备注") + private String remark; + + @Schema(title = "成功条数") + private Integer successNum; + + @Schema(title = "失败条数") + private Integer failNum; + + @Schema(title = "创建时间") + private LocalDateTime createTime; + +} diff --git a/admin/src/main/java/com/baiye/qo/ClueRecordQo.java b/admin/src/main/java/com/baiye/qo/ClueRecordQo.java new file mode 100644 index 0000000..34c7212 --- /dev/null +++ b/admin/src/main/java/com/baiye/qo/ClueRecordQo.java @@ -0,0 +1,29 @@ +package com.baiye.qo; + +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springdoc.api.annotations.ParameterObject; + +/** + * @Author YQY + * @Date 2023/8/2 + */ +@Data +@Schema(title = "导入记录查询对象") +@ParameterObject +public class ClueRecordQo { + + /** + * 上传文件名 + */ + @Parameter(description = "上传文件名") + private String oldFileName; + + @Parameter(description = "开始时间") + private String startTime; + + @Parameter(description = "结束时间") + private String endTime; + +} diff --git a/admin/src/main/java/com/baiye/task/SyncUploadFileTask.java b/admin/src/main/java/com/baiye/task/SyncUploadFileTask.java index 8e6f52f..b91bdbf 100644 --- a/admin/src/main/java/com/baiye/task/SyncUploadFileTask.java +++ b/admin/src/main/java/com/baiye/task/SyncUploadFileTask.java @@ -1,7 +1,6 @@ package com.baiye.task; import com.alibaba.excel.EasyExcelFactory; -import com.baiye.easyexcel.dto.ClueListenerDto; import com.baiye.easyexcel.listener.ClueListener; import com.baiye.modules.distribute.entity.ClueRecordEntity; import com.baiye.modules.distribute.service.ClueService; @@ -25,17 +24,14 @@ public class SyncUploadFileTask { */ @Async public void clueUpload(ClueRecordEntity clueRecordEntity, ClueService clueService) { - try { FileInputStream file = new FileInputStream(clueRecordEntity.getUrl()); - EasyExcelFactory.read(file, ClueListenerDto.class, new ClueListener(clueService, clueRecordEntity)) - .build() - .readAll(); + EasyExcelFactory.read(file, new ClueListener(clueService, clueRecordEntity)).build().readAll(); } catch (FileNotFoundException e) { + log.error("========文件读取错误=========="); e.printStackTrace(); } - } } diff --git a/admin/src/main/java/com/baiye/utils/ClueFileTestingUtil.java b/admin/src/main/java/com/baiye/utils/ClueFileTestingUtil.java index d9c00c7..60f5370 100644 --- a/admin/src/main/java/com/baiye/utils/ClueFileTestingUtil.java +++ b/admin/src/main/java/com/baiye/utils/ClueFileTestingUtil.java @@ -3,11 +3,14 @@ package com.baiye.utils; import cn.hutool.core.io.FileUtil; import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelUtil; -import com.hccake.ballcat.common.core.exception.BusinessException; -import com.hccake.ballcat.common.model.result.BaseResultCode; -import lombok.extern.slf4j.Slf4j; +import com.alibaba.excel.EasyExcelFactory; +import com.baiye.easyexcel.dto.ClueListenerDto; +import com.baiye.easyexcel.listener.CheckClueListenerHead; +import com.baiye.exception.BusinessException; +import com.baiye.result.BaseResultCode; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; @@ -24,39 +27,33 @@ public class ClueFileTestingUtil { /** * 检测Excel文件格式，内容，量 */ - public static void testingExcel(MultipartFile file) { + public static List testingExcel(MultipartFile file) { String fileSuffix = FileUtil.getSuffix(file.getOriginalFilename()); if (!(fileSuffix.equals("xlsx") || fileSuffix.equals("xls"))) { - throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR, "文件格式错误！ 请上传xlsx、xls格式"); + // throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR, + // "文件格式错误,请上传xlsx或xls格式"); + throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR.getCode(), "文件格式错误！ 请上传xlsx、xls格式"); } InputStream inputStream; ExcelReader reader; try { inputStream = file.getInputStream(); reader = ExcelUtil.getReader(inputStream); + // 检测头信息CheckClueListenerHead + EasyExcelFactory.read(file.getInputStream(), ClueListenerDto.class, new CheckClueListenerHead()) + .build() + .readAll(); } - catch (Exception e) { + catch (IOException e) { throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR, "文件读取错误,请检查文件"); } - // 检测excel内容格式(表头信息) - List excelHeadList = reader.readRow(0); - if (excelHeadList.size() >= 4) { - String nid = String.valueOf(excelHeadList.get(0)); - String origin = String.valueOf(excelHeadList.get(1)); - String remark = String.valueOf(excelHeadList.get(2)); - String date = String.valueOf(excelHeadList.get(3)); - if (!(nid.equals("手机号") && origin.equals("渠道来源") && remark.equals("备注") - && date.equals("日期(****/**/** 00:00:00)"))) { - throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR, "文件内容格式错误,请获取最新模板"); - } - } // 检测excel数量 int rowCount = reader.getRowCount() - 1; if (rowCount < 1) throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR, "空文件,请检查文件内容"); if (rowCount > 1000000) throw new BusinessException(BaseResultCode.FILE_UPLOAD_ERROR, "文件行数不得超过100w行,请处理"); - + return reader.readRow(0); } /** diff --git a/admin/src/main/resources/application-dev.yml b/admin/src/main/resources/application-dev.yml index c1d4f4c..8585fa9 100644 --- a/admin/src/main/resources/application-dev.yml +++ b/admin/src/main/resources/application-dev.yml @@ -10,12 +10,10 @@ spring: timeout: 5000 database: 7 -ballcat: - oss: - endpoint: http://oss-cn-shanghai.aliyuncs.com - access-key: your key here - access-secret: your secret here - bucket: your-bucket-here +business: + codes: + - ROLE_ADMIN + - ROLE_SALES_EXECUTIVE springdoc: swagger-ui: diff --git a/admin/src/main/resources/file/template.xlsx b/admin/src/main/resources/file/template.xlsx new file mode 100644 index 0000000..2db65d7 Binary files /dev/null and b/admin/src/main/resources/file/template.xlsx differ diff --git a/admin/src/main/resources/mapper/ClueRecordMapper.xml b/admin/src/main/resources/mapper/ClueRecordMapper.xml new file mode 100644 index 0000000..0f3f54c --- /dev/null +++ b/admin/src/main/resources/mapper/ClueRecordMapper.xml @@ -0,0 +1,25 @@ + + + + + cr.clue_record_id, + cr.status, + cr.task_id, + cr.old_file_name, + cr.url, + cr.remark, + cr.success_num, + cr.fail_num, + cr.create_time, + cr.update_time + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 099c914..c69687d 100644 --- a/pom.xml +++ b/pom.xml @@ -381,11 +381,6 @@ ad-distribute-starter-file 1.1.0 - - com.baiye - ad-distribute-starter-oss - 1.1.0 - com.baiye