diff --git a/pom.xml b/pom.xml index f7f68d6..0dcfa81 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ tashow-framework tashow-module tashow-gateway + tashow-feign ${project.artifactId} diff --git a/tashow-dependencies/pom.xml b/tashow-dependencies/pom.xml index 94a84aa..eae90aa 100644 --- a/tashow-dependencies/pom.xml +++ b/tashow-dependencies/pom.xml @@ -81,48 +81,6 @@ - - - cn.dev33 - sa-token-reactor-spring-boot3-starter - 1.42.0 - - - - cn.dev33 - sa-token-spring-boot3-starter - 1.42.0 - - - - - cn.dev33 - sa-token-sso - 1.42.0 - - - - - cn.dev33 - sa-token-oauth2 - 1.42.0 - - - - - cn.dev33 - sa-token-redis-jackson - 1.42.0 - - - - com.dtflys.forest - forest-spring-boot-starter - 1.5.26 - - - - io.netty @@ -167,27 +125,22 @@ com.tashow.cloud - tashow-module-system-api + tashow-system-api ${revision} com.tashow.cloud - tashow-module-system-biz + tashow-module-system ${revision} com.tashow.cloud - tashow-module-infra-api + tashow-infra-api ${revision} com.tashow.cloud - tashow-module-user-api - ${revision} - - - com.tashow.cloud - tashow-module-infra-biz + tashow-module-infra ${revision} diff --git a/tashow-feign/pom.xml b/tashow-feign/pom.xml new file mode 100644 index 0000000..feb8d49 --- /dev/null +++ b/tashow-feign/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + com.tashow.cloud + tashow-platform + ${revision} + + + tashow-feign + pom + + + tashow-infra-api + tashow-system-api + + + diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/pom.xml b/tashow-feign/tashow-infra-api/pom.xml similarity index 93% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/pom.xml rename to tashow-feign/tashow-infra-api/pom.xml index 604aaef..02d7fb8 100644 --- a/tashow-module/tashow-module-infra/tashow-module-infra-api/pom.xml +++ b/tashow-feign/tashow-infra-api/pom.xml @@ -5,10 +5,10 @@ 4.0.0 com.tashow.cloud - tashow-module-infra + tashow-feign ${revision} - tashow-module-infra-api + tashow-infra-api jar ${project.artifactId} diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/config/ConfigApi.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/config/ConfigApi.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/config/ConfigApi.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/config/ConfigApi.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/FileApi.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/FileApi.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/FileApi.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/FileApi.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/dto/FileCreateReqDTO.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/dto/FileCreateReqDTO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/dto/FileCreateReqDTO.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/dto/FileCreateReqDTO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/ApiAccessLogApi.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/ApiAccessLogApi.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/ApiAccessLogApi.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/ApiAccessLogApi.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/ApiErrorLogApi.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/ApiErrorLogApi.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/ApiErrorLogApi.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/ApiErrorLogApi.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/dto/ApiAccessLogCreateReqDTO.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/dto/ApiAccessLogCreateReqDTO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/dto/ApiAccessLogCreateReqDTO.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/dto/ApiAccessLogCreateReqDTO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/dto/ApiErrorLogCreateReqDTO.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/dto/ApiErrorLogCreateReqDTO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/dto/ApiErrorLogCreateReqDTO.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/logger/dto/ApiErrorLogCreateReqDTO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/package-info.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/package-info.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/websocket/WebSocketSenderApi.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/websocket/WebSocketSenderApi.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/websocket/WebSocketSenderApi.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/websocket/WebSocketSenderApi.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/websocket/dto/WebSocketSendReqDTO.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/websocket/dto/WebSocketSendReqDTO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/api/websocket/dto/WebSocketSendReqDTO.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/websocket/dto/WebSocketSendReqDTO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/ApiConstants.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/ApiConstants.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/ApiConstants.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/ApiConstants.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/DictTypeConstants.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/DictTypeConstants.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/DictTypeConstants.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/DictTypeConstants.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/ErrorCodeConstants.java b/tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/ErrorCodeConstants.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/ErrorCodeConstants.java rename to tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/enums/ErrorCodeConstants.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/pom.xml b/tashow-feign/tashow-system-api/pom.xml similarity index 93% rename from tashow-module/tashow-module-system/tashow-module-system-api/pom.xml rename to tashow-feign/tashow-system-api/pom.xml index 1854e56..ef273af 100644 --- a/tashow-module/tashow-module-system/tashow-module-system-api/pom.xml +++ b/tashow-feign/tashow-system-api/pom.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.tashow.cloud - tashow-module-system + tashow-feign ${revision} 4.0.0 - tashow-module-system-api + tashow-system-api jar ${project.artifactId} diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/DeptApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/DeptApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/DeptApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/DeptApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/PostApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/PostApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/PostApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/PostApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/dto/DeptRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/dto/DeptRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/dto/DeptRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/dto/DeptRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/dto/PostRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/dto/PostRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/dto/PostRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dept/dto/PostRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dict/DictDataApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dict/DictDataApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dict/DictDataApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dict/DictDataApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dict/dto/DictDataRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dict/dto/DictDataRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/dict/dto/DictDataRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/dict/dto/DictDataRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/LoginLogApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/LoginLogApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/LoginLogApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/LoginLogApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/OperateLogApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/OperateLogApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/OperateLogApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/OperateLogApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/LoginLogCreateReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/LoginLogCreateReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/LoginLogCreateReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/LoginLogCreateReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogCreateReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogCreateReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogCreateReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogCreateReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogPageReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogPageReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogPageReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogPageReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/logger/dto/OperateLogRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/mail/MailSendApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/mail/MailSendApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/mail/MailSendApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/mail/MailSendApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/mail/dto/MailSendSingleToUserReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/mail/dto/MailSendSingleToUserReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/mail/dto/MailSendSingleToUserReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/mail/dto/MailSendSingleToUserReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/notify/NotifyMessageSendApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/notify/NotifyMessageSendApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/notify/NotifyMessageSendApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/notify/NotifyMessageSendApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/notify/dto/NotifySendSingleToUserReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/notify/dto/NotifySendSingleToUserReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/notify/dto/NotifySendSingleToUserReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/notify/dto/NotifySendSingleToUserReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/OAuth2TokenApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/OAuth2TokenApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/OAuth2TokenApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/OAuth2TokenApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/oauth2/dto/OAuth2AccessTokenRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/package-info.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/package-info.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/PermissionApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/PermissionApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/PermissionApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/PermissionApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/RoleApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/RoleApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/RoleApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/RoleApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/dto/DeptDataPermissionRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/dto/DeptDataPermissionRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/dto/DeptDataPermissionRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/permission/dto/DeptDataPermissionRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/SmsCodeApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/SmsCodeApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/SmsCodeApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/SmsCodeApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/SmsSendApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/SmsSendApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/SmsSendApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/SmsSendApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeSendReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeSendReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeSendReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeSendReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeUseReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeUseReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeUseReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeUseReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeValidateReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeValidateReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeValidateReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/code/SmsCodeValidateReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/send/SmsSendSingleToUserReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/send/SmsSendSingleToUserReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/send/SmsSendSingleToUserReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/sms/dto/send/SmsSendSingleToUserReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/SocialClientApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/SocialClientApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/SocialClientApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/SocialClientApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/SocialUserApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/SocialUserApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/SocialUserApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/SocialUserApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserBindReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserBindReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserBindReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserBindReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserUnbindReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserUnbindReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserUnbindReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialUserUnbindReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxJsapiSignatureRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxJsapiSignatureRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxJsapiSignatureRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxJsapiSignatureRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxPhoneNumberInfoRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxPhoneNumberInfoRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxPhoneNumberInfoRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxPhoneNumberInfoRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxQrcodeReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxQrcodeReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxQrcodeReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxQrcodeReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxaSubscribeMessageSendReqDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxaSubscribeMessageSendReqDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxaSubscribeMessageSendReqDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxaSubscribeMessageSendReqDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxaSubscribeTemplateRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxaSubscribeTemplateRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxaSubscribeTemplateRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/social/dto/SocialWxaSubscribeTemplateRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/tenant/TenantApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/tenant/TenantApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/tenant/TenantApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/tenant/TenantApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/user/AdminUserApi.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/user/AdminUserApi.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/user/AdminUserApi.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/user/AdminUserApi.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/user/dto/AdminUserRespDTO.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/user/dto/AdminUserRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/api/user/dto/AdminUserRespDTO.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/api/user/dto/AdminUserRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/ApiConstants.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/ApiConstants.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/ApiConstants.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/ApiConstants.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/DictTypeConstants.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/DictTypeConstants.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/DictTypeConstants.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/DictTypeConstants.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/ErrorCodeConstants.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/ErrorCodeConstants.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/ErrorCodeConstants.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/ErrorCodeConstants.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/LogRecordConstants.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/LogRecordConstants.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/LogRecordConstants.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/LogRecordConstants.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/common/SexEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/common/SexEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/common/SexEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/common/SexEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/logger/LoginLogTypeEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/logger/LoginLogTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/logger/LoginLogTypeEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/logger/LoginLogTypeEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/logger/LoginResultEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/logger/LoginResultEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/logger/LoginResultEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/logger/LoginResultEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/mail/MailSendStatusEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/mail/MailSendStatusEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/mail/MailSendStatusEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/mail/MailSendStatusEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/notice/NoticeTypeEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/notice/NoticeTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/notice/NoticeTypeEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/notice/NoticeTypeEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/notify/NotifyTemplateTypeEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/notify/NotifyTemplateTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/notify/NotifyTemplateTypeEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/notify/NotifyTemplateTypeEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/oauth2/OAuth2ClientConstants.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/oauth2/OAuth2ClientConstants.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/oauth2/OAuth2ClientConstants.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/oauth2/OAuth2ClientConstants.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/oauth2/OAuth2GrantTypeEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/oauth2/OAuth2GrantTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/oauth2/OAuth2GrantTypeEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/oauth2/OAuth2GrantTypeEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/DataScopeEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/DataScopeEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/DataScopeEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/DataScopeEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/MenuTypeEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/MenuTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/MenuTypeEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/MenuTypeEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/RoleCodeEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/RoleCodeEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/RoleCodeEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/RoleCodeEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/RoleTypeEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/RoleTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/RoleTypeEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/permission/RoleTypeEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsReceiveStatusEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsReceiveStatusEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsReceiveStatusEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsReceiveStatusEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsSceneEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsSceneEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsSceneEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsSceneEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsSendStatusEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsSendStatusEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsSendStatusEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsSendStatusEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsTemplateTypeEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsTemplateTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsTemplateTypeEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/sms/SmsTemplateTypeEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/social/SocialTypeEnum.java b/tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/social/SocialTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-api/src/main/java/com/tashow/cloud/systemapi/enums/social/SocialTypeEnum.java rename to tashow-feign/tashow-system-api/src/main/java/com/tashow/cloud/systemapi/enums/social/SocialTypeEnum.java diff --git a/tashow-framework/pom.xml b/tashow-framework/pom.xml index d28e9d9..0e47e10 100644 --- a/tashow-framework/pom.xml +++ b/tashow-framework/pom.xml @@ -26,6 +26,7 @@ tashow-data-mybatis tashow-data-redis tashow-data-excel + tashow-data-es diff --git a/tashow-framework/tashow-data-es/pom.xml b/tashow-framework/tashow-data-es/pom.xml new file mode 100644 index 0000000..5cb06d8 --- /dev/null +++ b/tashow-framework/tashow-data-es/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + com.tashow.cloud + tashow-framework + ${revision} + + tashow-data-es + jar + + ${project.artifactId} + es 封装拓展 + + + + + org.springframework.boot + spring-boot-starter-data-elasticsearch + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + com.tashow.cloud + tashow-common + + + + + org.projectlombok + lombok + true + + + diff --git a/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchAutoConfiguration.java b/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchAutoConfiguration.java new file mode 100644 index 0000000..992e232 --- /dev/null +++ b/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchAutoConfiguration.java @@ -0,0 +1,61 @@ +package com.tashow.cloud.es.config; + +import co.elastic.clients.elasticsearch.ElasticsearchClient; +import co.elastic.clients.json.jackson.JacksonJsonpMapper; +import co.elastic.clients.transport.ElasticsearchTransport; +import co.elastic.clients.transport.rest_client.RestClientTransport; +import lombok.extern.slf4j.Slf4j; +import org.apache.http.HttpHost; +import org.elasticsearch.client.RestClient; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.Bean; + +import javax.annotation.PreDestroy; + +@Slf4j +@AutoConfiguration +public class ElasticsearchAutoConfiguration { + + private RestClient restClient; + + @Bean + public ElasticsearchClient elasticsearchClient(ElasticsearchProperties properties) { + // 1. 构建 HTTP 主机数组 + HttpHost[] hosts = properties.getUris().stream() + .map(uri -> { + if (!uri.startsWith("http")) { + throw new IllegalArgumentException("URI 必须包含协议 (http/https)"); + } + return HttpHost.create(uri); + }) + .toArray(HttpHost[]::new); + + // 2. 创建低级 REST 客户端 (无认证) + this.restClient = RestClient.builder(hosts) + .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder + .setConnectTimeout(properties.getConnectTimeout()) + .setSocketTimeout(properties.getSocketTimeout())) + .build(); + + // 3. 创建 Transport 层 + ElasticsearchTransport transport = new RestClientTransport( + restClient, + new JacksonJsonpMapper() // 使用 Jackson 处理 JSON + ); + + log.info("[Elasticsearch] 客户端初始化完成，节点: {}", properties.getUris()); + return new ElasticsearchClient(transport); + } + + @PreDestroy + public void destroy() { + if (restClient != null) { + try { + restClient.close(); + log.info("[Elasticsearch] 客户端已关闭"); + } catch (Exception e) { + log.error("[Elasticsearch] 客户端关闭异常", e); + } + } + } +} \ No newline at end of file diff --git a/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchConfig.java b/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchConfig.java new file mode 100644 index 0000000..6e3979f --- /dev/null +++ b/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchConfig.java @@ -0,0 +1,31 @@ +/* +package com.tashow.cloud.es.config; + +import co.elastic.clients.elasticsearch.ElasticsearchClient; +import co.elastic.clients.json.jackson.JacksonJsonpMapper; +import co.elastic.clients.transport.ElasticsearchTransport; +import co.elastic.clients.transport.rest_client.RestClientTransport; +import org.apache.http.HttpHost; +import org.elasticsearch.client.RestClient; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class ElasticsearchConfig { + + @Bean + public ElasticsearchClient elasticsearchClient() { + // 创建低级客户端 + RestClient restClient = RestClient.builder( + new HttpHost("43.139.42.137", 9200) + ).build(); + + // 使用 Jackson 映射器创建传输层 + ElasticsearchTransport transport = new RestClientTransport( + restClient, new JacksonJsonpMapper() + ); + + // 创建高级客户端 + return new ElasticsearchClient(transport); + } +}*/ diff --git a/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchConfigTest.java b/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchConfigTest.java new file mode 100644 index 0000000..debaab0 --- /dev/null +++ b/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchConfigTest.java @@ -0,0 +1,65 @@ +/* +package com.tashow.cloud.es.config; + +import co.elastic.clients.elasticsearch.ElasticsearchClient; +import co.elastic.clients.json.jackson.JacksonJsonpMapper; +import co.elastic.clients.transport.ElasticsearchTransport; +import co.elastic.clients.transport.rest_client.RestClientTransport; +import lombok.extern.slf4j.Slf4j; +import org.apache.http.HttpHost; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.elasticsearch.client.RestClient; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; + +import java.util.Arrays; + +@Slf4j +@AutoConfiguration +@EnableConfigurationProperties(ElasticsearchProperties.class) +public class ElasticsearchConfigTest { + + @Bean + public ElasticsearchClient elasticsearchClient(ElasticsearchProperties properties) { + // 1. 创建低级 REST 客户端 + RestClient restClient = RestClient.builder(buildHttpHosts(properties)) + .setHttpClientConfigCallback(httpClientBuilder -> { + // 认证配置 + if (properties.getUsername() != null) { + CredentialsProvider credsProvider = new BasicCredentialsProvider(); + credsProvider.setCredentials( + AuthScope.ANY, + new UsernamePasswordCredentials(properties.getUsername(), properties.getPassword()) + ); + httpClientBuilder.setDefaultCredentialsProvider(credsProvider); + } + return httpClientBuilder; + }) + .build(); + + // 2. 创建 Transport 层 + ElasticsearchTransport transport = new RestClientTransport( + restClient, + new JacksonJsonpMapper() // 使用 Jackson 处理 JSON + ); + + // 3. 返回新客户端 + return new ElasticsearchClient(transport); + } + + private HttpHost[] buildHttpHosts(ElasticsearchProperties properties) { + return Arrays.stream(properties.getUris()) + .map(uri -> { + try { + return HttpHost.create(uri); + } catch (Exception e) { + throw new IllegalArgumentException("Invalid Elasticsearch URI: " + uri, e); + } + }) + .toArray(HttpHost[]::new); + } +}*/ diff --git a/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchProperties.java b/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchProperties.java new file mode 100644 index 0000000..2a52ff6 --- /dev/null +++ b/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/config/ElasticsearchProperties.java @@ -0,0 +1,31 @@ +package com.tashow.cloud.es.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +import java.util.List; + +@Data +public class ElasticsearchProperties { + + /** + * 是否启用 Elasticsearch + */ + private Boolean enabled = true; + + /** + * 节点地址列表 (格式: http://ip:port) + */ + private List uris = List.of("http://43.139.42.137:9200"); + + /** + * 连接超时时间 (ms) + */ + private Integer connectTimeout = 3000; + + /** + * 通信超时时间 (ms) + */ + private Integer socketTimeout = 10000; +} diff --git a/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/service/ElasticsearchService.java b/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/service/ElasticsearchService.java new file mode 100644 index 0000000..b1488df --- /dev/null +++ b/tashow-framework/tashow-data-es/src/main/java/com/tashow/cloud/es/service/ElasticsearchService.java @@ -0,0 +1,34 @@ +package com.tashow.cloud.es.service; + +import co.elastic.clients.elasticsearch.ElasticsearchClient; +import co.elastic.clients.elasticsearch.core.IndexResponse; +import org.springframework.stereotype.Service; + +import java.io.IOException; + +@Service +public class ElasticsearchService { + + private final ElasticsearchClient client; + + public ElasticsearchService(ElasticsearchClient client) { + this.client = client; + } + + /** + * 向 Elasticsearch 索引中插入数据 + * + * @param indexName 索引名称 + * @param id 文档 ID + * @param jsonData JSON 格式的文档数据 + * @return 插入结果 + * @throws IOException 如果发生 I/O 错误 + */ + public IndexResponse insertDocument(String indexName, String id, String jsonData) throws IOException { + return client.index(i -> i + .index(indexName) + .id(id) + .document(jsonData) + ); + } +} diff --git a/tashow-framework/tashow-data-es/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tashow-framework/tashow-data-es/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..00c3efd --- /dev/null +++ b/tashow-framework/tashow-data-es/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.tashow.cloud.es.config.ElasticsearchAutoConfiguration +com.tashow.cloud.es.service.ElasticsearchService +com.tashow.cloud.es.config.ElasticsearchProperties diff --git a/tashow-framework/tashow-data-excel/pom.xml b/tashow-framework/tashow-data-excel/pom.xml index 3074c45..262ee18 100644 --- a/tashow-framework/tashow-data-excel/pom.xml +++ b/tashow-framework/tashow-data-excel/pom.xml @@ -36,7 +36,7 @@ com.tashow.cloud - tashow-module-system-api + tashow-system-api ${revision} diff --git a/tashow-framework/tashow-data-mybatis/src/main/java/com/tashow/cloud/mybatis/mybatis/config/MybatisAutoConfiguration.java b/tashow-framework/tashow-data-mybatis/src/main/java/com/tashow/cloud/mybatis/mybatis/config/BaseMybatisAutoConfiguration.java similarity index 98% rename from tashow-framework/tashow-data-mybatis/src/main/java/com/tashow/cloud/mybatis/mybatis/config/MybatisAutoConfiguration.java rename to tashow-framework/tashow-data-mybatis/src/main/java/com/tashow/cloud/mybatis/mybatis/config/BaseMybatisAutoConfiguration.java index 0163eb2..7600b7d 100644 --- a/tashow-framework/tashow-data-mybatis/src/main/java/com/tashow/cloud/mybatis/mybatis/config/MybatisAutoConfiguration.java +++ b/tashow-framework/tashow-data-mybatis/src/main/java/com/tashow/cloud/mybatis/mybatis/config/BaseMybatisAutoConfiguration.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; @AutoConfiguration(before = MybatisPlusAutoConfiguration.class) // 目的：先于 MyBatis Plus 自动配置，避免 @MapperScan 可能扫描不到 Mapper 打印 warn 日志 @MapperScan(value = "${tashow.info.base-package}", annotationClass = Mapper.class, lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载，目前仅用于单元测试 -public class MybatisAutoConfiguration { +public class BaseMybatisAutoConfiguration { static { // 动态 SQL 智能优化支持本地缓存加速解析，更完善的租户复杂 XML 动态 SQL 支持，静态注入缓存 diff --git a/tashow-framework/tashow-data-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tashow-framework/tashow-data-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 9df82c2..8a31041 100644 --- a/tashow-framework/tashow-data-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/tashow-framework/tashow-data-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,3 @@ com.tashow.cloud.mybatis.datasource.config.DataSourceAutoConfiguration -com.tashow.cloud.mybatis.mybatis.config.MybatisAutoConfiguration +com.tashow.cloud.mybatis.mybatis.config.BaseMybatisAutoConfiguration com.tashow.cloud.mybatis.translate.config.TranslateAutoConfiguration diff --git a/tashow-framework/tashow-data-permission/pom.xml b/tashow-framework/tashow-data-permission/pom.xml index 48ca4b3..84f3240 100644 --- a/tashow-framework/tashow-data-permission/pom.xml +++ b/tashow-framework/tashow-data-permission/pom.xml @@ -43,7 +43,7 @@ com.tashow.cloud - tashow-module-system-api + tashow-system-api ${revision} diff --git a/tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/CacheAutoConfiguration.java b/tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/TashowCacheAutoConfiguration.java similarity index 96% rename from tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/CacheAutoConfiguration.java rename to tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/TashowCacheAutoConfiguration.java index dcb0e72..37c80f6 100644 --- a/tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/CacheAutoConfiguration.java +++ b/tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/TashowCacheAutoConfiguration.java @@ -19,7 +19,7 @@ import org.springframework.util.StringUtils; import java.util.Objects; -import static com.tashow.cloud.redis.config.RedisAutoConfiguration.buildRedisSerializer; +import static com.tashow.cloud.redis.config.TashowRedisAutoConfiguration.buildRedisSerializer; /** @@ -28,7 +28,7 @@ import static com.tashow.cloud.redis.config.RedisAutoConfiguration.buildRedisSer @AutoConfiguration @EnableConfigurationProperties({CacheProperties.class, TashowCacheProperties.class}) @EnableCaching -public class CacheAutoConfiguration { +public class TashowCacheAutoConfiguration { /** * RedisCacheConfiguration Bean diff --git a/tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/RedisAutoConfiguration.java b/tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/TashowRedisAutoConfiguration.java similarity index 97% rename from tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/RedisAutoConfiguration.java rename to tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/TashowRedisAutoConfiguration.java index 39a9ee7..116c615 100644 --- a/tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/RedisAutoConfiguration.java +++ b/tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/TashowRedisAutoConfiguration.java @@ -14,7 +14,7 @@ import org.springframework.data.redis.serializer.RedisSerializer; * Redis 配置类 */ @AutoConfiguration(before = RedissonAutoConfigurationV2.class) // 目的：使用自己定义的 RedisTemplate Bean -public class RedisAutoConfiguration { +public class TashowRedisAutoConfiguration { /** * 创建 RedisTemplate Bean，使用 JSON 序列化方式 diff --git a/tashow-framework/tashow-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tashow-framework/tashow-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index bcaa8a2..3b32e89 100644 --- a/tashow-framework/tashow-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/tashow-framework/tashow-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -com.tashow.cloud.redis.config.RedisAutoConfiguration -com.tashow.cloud.redis.config.CacheAutoConfiguration +com.tashow.cloud.redis.config.TashowRedisAutoConfiguration +com.tashow.cloud.redis.config.TashowCacheAutoConfiguration diff --git a/tashow-framework/tashow-framework-mq/pom.xml b/tashow-framework/tashow-framework-mq/pom.xml index 41a37c1..3128466 100644 --- a/tashow-framework/tashow-framework-mq/pom.xml +++ b/tashow-framework/tashow-framework-mq/pom.xml @@ -20,23 +20,16 @@ com.tashow.cloud tashow-data-redis - - - org.springframework.kafka - spring-kafka - true + org.springframework.boot + spring-boot-starter-amqp + org.springframework.amqp spring-rabbit true - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/package-info.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/package-info.java new file mode 100644 index 0000000..356754a --- /dev/null +++ b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/package-info.java @@ -0,0 +1 @@ +package com.tashow.cloud.mq; \ No newline at end of file diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/config/RedisMQConsumerAutoConfiguration.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/config/RedisMQConsumerAutoConfiguration.java deleted file mode 100644 index c26f4d2..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/config/RedisMQConsumerAutoConfiguration.java +++ /dev/null @@ -1,151 +0,0 @@ -package com.tashow.cloud.mq.redis.config; - -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.system.SystemUtil; -import com.tashow.cloud.common.enums.DocumentEnum; -import com.tashow.cloud.mq.redis.core.RedisMQTemplate; -import com.tashow.cloud.mq.redis.core.job.RedisPendingMessageResendJob; -import com.tashow.cloud.mq.redis.core.pubsub.AbstractRedisChannelMessageListener; -import com.tashow.cloud.mq.redis.core.stream.AbstractRedisStreamMessageListener; -import com.tashow.cloud.redis.config.RedisAutoConfiguration; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.context.annotation.Bean; -import org.springframework.data.redis.connection.RedisServerCommands; -import org.springframework.data.redis.connection.stream.Consumer; -import org.springframework.data.redis.connection.stream.ObjectRecord; -import org.springframework.data.redis.connection.stream.ReadOffset; -import org.springframework.data.redis.connection.stream.StreamOffset; -import org.springframework.data.redis.core.RedisCallback; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.listener.ChannelTopic; -import org.springframework.data.redis.listener.RedisMessageListenerContainer; -import org.springframework.data.redis.stream.StreamMessageListenerContainer; -import org.springframework.scheduling.annotation.EnableScheduling; - -import java.util.List; -import java.util.Properties; - -/** - * Redis 消息队列 Consumer 配置类 - * - * @author 芋道源码 - */ -@Slf4j -@EnableScheduling // 启用定时任务，用于 RedisPendingMessageResendJob 重发消息 -@AutoConfiguration(after = RedisAutoConfiguration.class) -public class RedisMQConsumerAutoConfiguration { - - /** - * 创建 Redis Pub/Sub 广播消费的容器 - */ - @Bean - @ConditionalOnBean(AbstractRedisChannelMessageListener.class) // 只有 AbstractChannelMessageListener 存在的时候，才需要注册 Redis pubsub 监听 - public RedisMessageListenerContainer redisMessageListenerContainer( - RedisMQTemplate redisMQTemplate, List> listeners) { - // 创建 RedisMessageListenerContainer 对象 - RedisMessageListenerContainer container = new RedisMessageListenerContainer(); - // 设置 RedisConnection 工厂。 - container.setConnectionFactory(redisMQTemplate.getRedisTemplate().getRequiredConnectionFactory()); - // 添加监听器 - listeners.forEach(listener -> { - listener.setRedisMQTemplate(redisMQTemplate); - container.addMessageListener(listener, new ChannelTopic(listener.getChannel())); - log.info("[redisMessageListenerContainer][注册 Channel({}) 对应的监听器({})]", - listener.getChannel(), listener.getClass().getName()); - }); - return container; - } - - /** - * 创建 Redis Stream 重新消费的任务 - */ - @Bean - @ConditionalOnBean(AbstractRedisStreamMessageListener.class) // 只有 AbstractStreamMessageListener 存在的时候，才需要注册 Redis pubsub 监听 - public RedisPendingMessageResendJob redisPendingMessageResendJob(List> listeners, - RedisMQTemplate redisTemplate, - @Value("${spring.application.name}") String groupName, - RedissonClient redissonClient) { - return new RedisPendingMessageResendJob(listeners, redisTemplate, groupName, redissonClient); - } - - /** - * 创建 Redis Stream 集群消费的容器 - * - * 基础知识：Redis Stream 的 xreadgroup 命令 - */ - @Bean(initMethod = "start", destroyMethod = "stop") - @ConditionalOnBean(AbstractRedisStreamMessageListener.class) // 只有 AbstractStreamMessageListener 存在的时候，才需要注册 Redis pubsub 监听 - public StreamMessageListenerContainer> redisStreamMessageListenerContainer( - RedisMQTemplate redisMQTemplate, List> listeners) { - RedisTemplate redisTemplate = redisMQTemplate.getRedisTemplate(); - checkRedisVersion(redisTemplate); - // 第一步，创建 StreamMessageListenerContainer 容器 - // 创建 options 配置 - StreamMessageListenerContainer.StreamMessageListenerContainerOptions> containerOptions = - StreamMessageListenerContainer.StreamMessageListenerContainerOptions.builder() - .batchSize(10) // 一次性最多拉取多少条消息 - .targetType(String.class) // 目标类型。统一使用 String，通过自己封装的 AbstractStreamMessageListener 去反序列化 - .build(); - // 创建 container 对象 - StreamMessageListenerContainer> container = - StreamMessageListenerContainer.create(redisMQTemplate.getRedisTemplate().getRequiredConnectionFactory(), containerOptions); - - // 第二步，注册监听器，消费对应的 Stream 主题 - String consumerName = buildConsumerName(); - listeners.parallelStream().forEach(listener -> { - log.info("[redisStreamMessageListenerContainer][开始注册 StreamKey({}) 对应的监听器({})]", - listener.getStreamKey(), listener.getClass().getName()); - // 创建 listener 对应的消费者分组 - try { - redisTemplate.opsForStream().createGroup(listener.getStreamKey(), listener.getGroup()); - } catch (Exception ignore) { - } - // 设置 listener 对应的 redisTemplate - listener.setRedisMQTemplate(redisMQTemplate); - // 创建 Consumer 对象 - Consumer consumer = Consumer.from(listener.getGroup(), consumerName); - // 设置 Consumer 消费进度，以最小消费进度为准 - StreamOffset streamOffset = StreamOffset.create(listener.getStreamKey(), ReadOffset.lastConsumed()); - // 设置 Consumer 监听 - StreamMessageListenerContainer.StreamReadRequestBuilder builder = StreamMessageListenerContainer.StreamReadRequest - .builder(streamOffset).consumer(consumer) - .autoAcknowledge(false) // 不自动 ack - .cancelOnError(throwable -> false); // 默认配置，发生异常就取消消费，显然不符合预期；因此，我们设置为 false - container.register(builder.build(), listener); - log.info("[redisStreamMessageListenerContainer][完成注册 StreamKey({}) 对应的监听器({})]", - listener.getStreamKey(), listener.getClass().getName()); - }); - return container; - } - - /** - * 构建消费者名字，使用本地 IP + 进程编号的方式。 - * 参考自 RocketMQ clientId 的实现 - * - * @return 消费者名字 - */ - private static String buildConsumerName() { - return String.format("%s@%d", SystemUtil.getHostInfo().getAddress(), SystemUtil.getCurrentPID()); - } - - /** - * 校验 Redis 版本号，是否满足最低的版本号要求！ - */ - private static void checkRedisVersion(RedisTemplate redisTemplate) { - // 获得 Redis 版本 - Properties info = redisTemplate.execute((RedisCallback) RedisServerCommands::info); - String version = MapUtil.getStr(info, "redis_version"); - // 校验最低版本必须大于等于 5.0.0 - int majorVersion = Integer.parseInt(StrUtil.subBefore(version, '.', false)); - if (majorVersion < 5) { - throw new IllegalStateException(StrUtil.format("您当前的 Redis 版本为 {}，小于最低要求的 5.0.0 版本！" + - "请参考 {} 文档进行安装。", version, DocumentEnum.REDIS_INSTALL.getUrl())); - } - } - -} diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/config/RedisMQProducerAutoConfiguration.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/config/RedisMQProducerAutoConfiguration.java deleted file mode 100644 index 0b2a62a..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/config/RedisMQProducerAutoConfiguration.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.tashow.cloud.mq.redis.config; - -import com.tashow.cloud.mq.redis.core.RedisMQTemplate; -import com.tashow.cloud.mq.redis.core.interceptor.RedisMessageInterceptor; -import com.tashow.cloud.redis.config.RedisAutoConfiguration; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.data.redis.core.StringRedisTemplate; - -import java.util.List; - -/** - * Redis 消息队列 Producer 配置类 - * - * @author 芋道源码 - */ -@Slf4j -@AutoConfiguration(after = RedisAutoConfiguration.class) -public class RedisMQProducerAutoConfiguration { - - @Bean - public RedisMQTemplate redisMQTemplate(StringRedisTemplate redisTemplate, - List interceptors) { - RedisMQTemplate redisMQTemplate = new RedisMQTemplate(redisTemplate); - // 添加拦截器 - interceptors.forEach(redisMQTemplate::addInterceptor); - return redisMQTemplate; - } - -} diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/RedisMQTemplate.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/RedisMQTemplate.java deleted file mode 100644 index 6d79c41..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/RedisMQTemplate.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.tashow.cloud.mq.redis.core; - -import com.tashow.cloud.common.util.json.JsonUtils; -import com.tashow.cloud.mq.redis.core.interceptor.RedisMessageInterceptor; -import com.tashow.cloud.mq.redis.core.message.AbstractRedisMessage; -import com.tashow.cloud.mq.redis.core.pubsub.AbstractRedisChannelMessage; -import com.tashow.cloud.mq.redis.core.stream.AbstractRedisStreamMessage; -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.springframework.data.redis.connection.stream.RecordId; -import org.springframework.data.redis.connection.stream.StreamRecords; -import org.springframework.data.redis.core.RedisTemplate; - -import java.util.ArrayList; -import java.util.List; - -/** - * Redis MQ 操作模板类 - * - * @author 芋道源码 - */ -@AllArgsConstructor -public class RedisMQTemplate { - - @Getter - private final RedisTemplate redisTemplate; - /** - * 拦截器数组 - */ - @Getter - private final List interceptors = new ArrayList<>(); - - /** - * 发送 Redis 消息，基于 Redis pub/sub 实现 - * - * @param message 消息 - */ - public void send(T message) { - try { - sendMessageBefore(message); - // 发送消息 - redisTemplate.convertAndSend(message.getChannel(), JsonUtils.toJsonString(message)); - } finally { - sendMessageAfter(message); - } - } - - /** - * 发送 Redis 消息，基于 Redis Stream 实现 - * - * @param message 消息 - * @return 消息记录的编号对象 - */ - public RecordId send(T message) { - try { - sendMessageBefore(message); - // 发送消息 - return redisTemplate.opsForStream().add(StreamRecords.newRecord() - .ofObject(JsonUtils.toJsonString(message)) // 设置内容 - .withStreamKey(message.getStreamKey())); // 设置 stream key - } finally { - sendMessageAfter(message); - } - } - - /** - * 添加拦截器 - * - * @param interceptor 拦截器 - */ - public void addInterceptor(RedisMessageInterceptor interceptor) { - interceptors.add(interceptor); - } - - private void sendMessageBefore(AbstractRedisMessage message) { - // 正序 - interceptors.forEach(interceptor -> interceptor.sendMessageBefore(message)); - } - - private void sendMessageAfter(AbstractRedisMessage message) { - // 倒序 - for (int i = interceptors.size() - 1; i >= 0; i--) { - interceptors.get(i).sendMessageAfter(message); - } - } - -} diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/interceptor/RedisMessageInterceptor.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/interceptor/RedisMessageInterceptor.java deleted file mode 100644 index 3cea3ff..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/interceptor/RedisMessageInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.tashow.cloud.mq.redis.core.interceptor; - -import com.tashow.cloud.mq.redis.core.message.AbstractRedisMessage; - -/** - * {@link AbstractRedisMessage} 消息拦截器 - * 通过拦截器，作为插件机制，实现拓展。 - * 例如说，多租户场景下的 MQ 消息处理 - * - * @author 芋道源码 - */ -public interface RedisMessageInterceptor { - - default void sendMessageBefore(AbstractRedisMessage message) { - } - - default void sendMessageAfter(AbstractRedisMessage message) { - } - - default void consumeMessageBefore(AbstractRedisMessage message) { - } - - default void consumeMessageAfter(AbstractRedisMessage message) { - } - -} diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/job/RedisPendingMessageResendJob.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/job/RedisPendingMessageResendJob.java deleted file mode 100644 index 7ddd81d..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/job/RedisPendingMessageResendJob.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.tashow.cloud.mq.redis.core.job; - -import cn.hutool.core.collection.CollUtil; -import com.tashow.cloud.mq.redis.core.RedisMQTemplate; -import com.tashow.cloud.mq.redis.core.stream.AbstractRedisStreamMessageListener; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; -import org.springframework.data.domain.Range; -import org.springframework.data.redis.connection.stream.*; -import org.springframework.data.redis.core.StreamOperations; -import org.springframework.scheduling.annotation.Scheduled; - -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * 这个任务用于处理，crash 之后的消费者未消费完的消息 - */ -@Slf4j -@AllArgsConstructor -public class RedisPendingMessageResendJob { - - private static final String LOCK_KEY = "redis:pending:msg:lock"; - - /** - * 消息超时时间，默认 5 分钟 - * - * 1. 超时的消息才会被重新投递 - * 2. 由于定时任务 1 分钟一次，消息超时后不会被立即重投，极端情况下消息5分钟过期后，再等 1 分钟才会被扫瞄到 - */ - private static final int EXPIRE_TIME = 5 * 60; - - private final List> listeners; - private final RedisMQTemplate redisTemplate; - private final String groupName; - private final RedissonClient redissonClient; - - /** - * 一分钟执行一次,这里选择每分钟的35秒执行，是为了避免整点任务过多的问题 - */ - @Scheduled(cron = "35 * * * * ?") - public void messageResend() { - RLock lock = redissonClient.getLock(LOCK_KEY); - // 尝试加锁 - if (lock.tryLock()) { - try { - execute(); - } catch (Exception ex) { - log.error("[messageResend][执行异常]", ex); - } finally { - lock.unlock(); - } - } - } - - /** - * 执行清理逻辑 - * - * @see 讨论 - */ - private void execute() { - StreamOperations ops = redisTemplate.getRedisTemplate().opsForStream(); - listeners.forEach(listener -> { - PendingMessagesSummary pendingMessagesSummary = Objects.requireNonNull(ops.pending(listener.getStreamKey(), groupName)); - // 每个消费者的 pending 队列消息数量 - Map pendingMessagesPerConsumer = pendingMessagesSummary.getPendingMessagesPerConsumer(); - pendingMessagesPerConsumer.forEach((consumerName, pendingMessageCount) -> { - log.info("[processPendingMessage][消费者({}) 消息数量({})]", consumerName, pendingMessageCount); - // 每个消费者的 pending消息的详情信息 - PendingMessages pendingMessages = ops.pending(listener.getStreamKey(), Consumer.from(groupName, consumerName), Range.unbounded(), pendingMessageCount); - if (pendingMessages.isEmpty()) { - return; - } - pendingMessages.forEach(pendingMessage -> { - // 获取消息上一次传递到 consumer 的时间, - long lastDelivery = pendingMessage.getElapsedTimeSinceLastDelivery().getSeconds(); - if (lastDelivery < EXPIRE_TIME){ - return; - } - // 获取指定 id 的消息体 - List> records = ops.range(listener.getStreamKey(), - Range.of(Range.Bound.inclusive(pendingMessage.getIdAsString()), Range.Bound.inclusive(pendingMessage.getIdAsString()))); - if (CollUtil.isEmpty(records)) { - return; - } - // 重新投递消息 - redisTemplate.getRedisTemplate().opsForStream().add(StreamRecords.newRecord() - .ofObject(records.get(0).getValue()) // 设置内容 - .withStreamKey(listener.getStreamKey())); - // ack 消息消费完成 - redisTemplate.getRedisTemplate().opsForStream().acknowledge(groupName, records.get(0)); - log.info("[processPendingMessage][消息({})重新投递成功]", records.get(0).getId()); - }); - }); - }); - } -} diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/message/AbstractRedisMessage.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/message/AbstractRedisMessage.java deleted file mode 100644 index 546934a..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/message/AbstractRedisMessage.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.tashow.cloud.mq.redis.core.message; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * Redis 消息抽象基类 - * - * @author 芋道源码 - */ -@Data -public abstract class AbstractRedisMessage { - - /** - * 头 - */ - private Map headers = new HashMap<>(); - - public String getHeader(String key) { - return headers.get(key); - } - - public void addHeader(String key, String value) { - headers.put(key, value); - } - -} diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/pubsub/AbstractRedisChannelMessage.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/pubsub/AbstractRedisChannelMessage.java deleted file mode 100644 index 3a46d92..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/pubsub/AbstractRedisChannelMessage.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.tashow.cloud.mq.redis.core.pubsub; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.tashow.cloud.mq.redis.core.message.AbstractRedisMessage; - -/** - * Redis Channel Message 抽象类 - * - * @author 芋道源码 - */ -public abstract class AbstractRedisChannelMessage extends AbstractRedisMessage { - - /** - * 获得 Redis Channel，默认使用类名 - * - * @return Channel - */ - @JsonIgnore // 避免序列化。原因是，Redis 发布 Channel 消息的时候，已经会指定。 - public String getChannel() { - return getClass().getSimpleName(); - } - -} diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/pubsub/AbstractRedisChannelMessageListener.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/pubsub/AbstractRedisChannelMessageListener.java deleted file mode 100644 index b64a550..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/pubsub/AbstractRedisChannelMessageListener.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.tashow.cloud.mq.redis.core.pubsub; - -import cn.hutool.core.util.TypeUtil; -import com.tashow.cloud.common.util.json.JsonUtils; -import com.tashow.cloud.mq.redis.core.RedisMQTemplate; -import com.tashow.cloud.mq.redis.core.interceptor.RedisMessageInterceptor; -import com.tashow.cloud.mq.redis.core.message.AbstractRedisMessage; -import lombok.Setter; -import lombok.SneakyThrows; -import org.springframework.data.redis.connection.Message; -import org.springframework.data.redis.connection.MessageListener; - -import java.lang.reflect.Type; -import java.util.List; - -/** - * Redis Pub/Sub 监听器抽象类，用于实现广播消费 - * - * @param 消息类型。一定要填写噢，不然会报错 - * - * @author 芋道源码 - */ -public abstract class AbstractRedisChannelMessageListener implements MessageListener { - - /** - * 消息类型 - */ - private final Class messageType; - /** - * Redis Channel - */ - private final String channel; - /** - * RedisMQTemplate - */ - @Setter - private RedisMQTemplate redisMQTemplate; - - @SneakyThrows - protected AbstractRedisChannelMessageListener() { - this.messageType = getMessageClass(); - this.channel = messageType.getDeclaredConstructor().newInstance().getChannel(); - } - - /** - * 获得 Sub 订阅的 Redis Channel 通道 - * - * @return channel - */ - public final String getChannel() { - return channel; - } - - @Override - public final void onMessage(Message message, byte[] bytes) { - T messageObj = JsonUtils.parseObject(message.getBody(), messageType); - try { - consumeMessageBefore(messageObj); - // 消费消息 - this.onMessage(messageObj); - } finally { - consumeMessageAfter(messageObj); - } - } - - /** - * 处理消息 - * - * @param message 消息 - */ - public abstract void onMessage(T message); - - /** - * 通过解析类上的泛型，获得消息类型 - * - * @return 消息类型 - */ - @SuppressWarnings("unchecked") - private Class getMessageClass() { - Type type = TypeUtil.getTypeArgument(getClass(), 0); - if (type == null) { - throw new IllegalStateException(String.format("类型(%s) 需要设置消息类型", getClass().getName())); - } - return (Class) type; - } - - private void consumeMessageBefore(AbstractRedisMessage message) { - assert redisMQTemplate != null; - List interceptors = redisMQTemplate.getInterceptors(); - // 正序 - interceptors.forEach(interceptor -> interceptor.consumeMessageBefore(message)); - } - - private void consumeMessageAfter(AbstractRedisMessage message) { - assert redisMQTemplate != null; - List interceptors = redisMQTemplate.getInterceptors(); - // 倒序 - for (int i = interceptors.size() - 1; i >= 0; i--) { - interceptors.get(i).consumeMessageAfter(message); - } - } - -} diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/stream/AbstractRedisStreamMessage.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/stream/AbstractRedisStreamMessage.java deleted file mode 100644 index d254d84..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/stream/AbstractRedisStreamMessage.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.tashow.cloud.mq.redis.core.stream; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.tashow.cloud.mq.redis.core.message.AbstractRedisMessage; - -/** - * Redis Stream Message 抽象类 - * - * @author 芋道源码 - */ -public abstract class AbstractRedisStreamMessage extends AbstractRedisMessage { - - /** - * 获得 Redis Stream Key，默认使用类名 - * - * @return Channel - */ - @JsonIgnore // 避免序列化 - public String getStreamKey() { - return getClass().getSimpleName(); - } - -} diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/stream/AbstractRedisStreamMessageListener.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/stream/AbstractRedisStreamMessageListener.java deleted file mode 100644 index bf30a9b..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/core/stream/AbstractRedisStreamMessageListener.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.tashow.cloud.mq.redis.core.stream; - -import cn.hutool.core.util.TypeUtil; -import com.tashow.cloud.common.util.json.JsonUtils; -import com.tashow.cloud.mq.redis.core.RedisMQTemplate; -import com.tashow.cloud.mq.redis.core.interceptor.RedisMessageInterceptor; -import com.tashow.cloud.mq.redis.core.message.AbstractRedisMessage; -import lombok.Getter; -import lombok.Setter; -import lombok.SneakyThrows; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.connection.stream.ObjectRecord; -import org.springframework.data.redis.stream.StreamListener; - -import java.lang.reflect.Type; -import java.util.List; - -/** - * Redis Stream 监听器抽象类，用于实现集群消费 - * - * @param 消息类型。一定要填写噢，不然会报错 - * - * @author 芋道源码 - */ -public abstract class AbstractRedisStreamMessageListener - implements StreamListener> { - - /** - * 消息类型 - */ - private final Class messageType; - /** - * Redis Channel - */ - @Getter - private final String streamKey; - - /** - * Redis 消费者分组，默认使用 spring.application.name 名字 - */ - @Value("${spring.application.name}") - @Getter - private String group; - /** - * RedisMQTemplate - */ - @Setter - private RedisMQTemplate redisMQTemplate; - - @SneakyThrows - protected AbstractRedisStreamMessageListener() { - this.messageType = getMessageClass(); - this.streamKey = messageType.getDeclaredConstructor().newInstance().getStreamKey(); - } - - @Override - public void onMessage(ObjectRecord message) { - // 消费消息 - T messageObj = JsonUtils.parseObject(message.getValue(), messageType); - try { - consumeMessageBefore(messageObj); - // 消费消息 - this.onMessage(messageObj); - // ack 消息消费完成 - redisMQTemplate.getRedisTemplate().opsForStream().acknowledge(group, message); - // TODO 芋艿：需要额外考虑以下几个点： - // 1. 处理异常的情况 - // 2. 发送日志；以及事务的结合 - // 3. 消费日志；以及通用的幂等性 - // 4. 消费失败的重试，https://zhuanlan.zhihu.com/p/60501638 - } finally { - consumeMessageAfter(messageObj); - } - } - - /** - * 处理消息 - * - * @param message 消息 - */ - public abstract void onMessage(T message); - - /** - * 通过解析类上的泛型，获得消息类型 - * - * @return 消息类型 - */ - @SuppressWarnings("unchecked") - private Class getMessageClass() { - Type type = TypeUtil.getTypeArgument(getClass(), 0); - if (type == null) { - throw new IllegalStateException(String.format("类型(%s) 需要设置消息类型", getClass().getName())); - } - return (Class) type; - } - - private void consumeMessageBefore(AbstractRedisMessage message) { - assert redisMQTemplate != null; - List interceptors = redisMQTemplate.getInterceptors(); - // 正序 - interceptors.forEach(interceptor -> interceptor.consumeMessageBefore(message)); - } - - private void consumeMessageAfter(AbstractRedisMessage message) { - assert redisMQTemplate != null; - List interceptors = redisMQTemplate.getInterceptors(); - // 倒序 - for (int i = interceptors.size() - 1; i >= 0; i--) { - interceptors.get(i).consumeMessageAfter(message); - } - } - -} diff --git a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/package-info.java b/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/package-info.java deleted file mode 100644 index cc39879..0000000 --- a/tashow-framework/tashow-framework-mq/src/main/java/com/tashow/cloud/mq/redis/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 消息队列，基于 Redis 提供： - * 1. 基于 Pub/Sub 实现广播消费 - * 2. 基于 Stream 实现集群消费 - */ -package com.tashow.cloud.mq.redis; diff --git a/tashow-framework/tashow-framework-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/tashow-framework/tashow-framework-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index ea037a6..7d713e1 100644 --- a/tashow-framework/tashow-framework-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/tashow-framework/tashow-framework-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1 @@ -com.tashow.cloud.mq.redis.config.RedisMQProducerAutoConfiguration -com.tashow.cloud.mq.redis.config.RedisMQConsumerAutoConfiguration com.tashow.cloud.mq.rabbitmq.config.RabbitMQAutoConfiguration diff --git a/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/idempotent/config/IdempotentConfiguration.java b/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/idempotent/config/IdempotentConfiguration.java index 784bbad..67effc5 100644 --- a/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/idempotent/config/IdempotentConfiguration.java +++ b/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/idempotent/config/IdempotentConfiguration.java @@ -6,14 +6,14 @@ import com.tashow.cloud.protection.idempotent.core.aop.IdempotentAspect; import com.tashow.cloud.protection.idempotent.core.keyresolver.IdempotentKeyResolver; import com.tashow.cloud.protection.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver; import com.tashow.cloud.protection.idempotent.core.redis.IdempotentRedisDAO; -import com.tashow.cloud.redis.config.RedisAutoConfiguration; +import com.tashow.cloud.redis.config.TashowRedisAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.core.StringRedisTemplate; import java.util.List; -@AutoConfiguration(after = RedisAutoConfiguration.class) +@AutoConfiguration(after = TashowRedisAutoConfiguration.class) public class IdempotentConfiguration { @Bean diff --git a/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/ratelimiter/config/RateLimiterConfiguration.java b/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/ratelimiter/config/RateLimiterConfiguration.java index 0ad87a8..b982bf4 100644 --- a/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/ratelimiter/config/RateLimiterConfiguration.java +++ b/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/ratelimiter/config/RateLimiterConfiguration.java @@ -3,7 +3,7 @@ package com.tashow.cloud.protection.ratelimiter.config; import com.tashow.cloud.protection.ratelimiter.core.aop.RateLimiterAspect; import com.tashow.cloud.protection.ratelimiter.core.keyresolver.RateLimiterKeyResolver; import com.tashow.cloud.protection.ratelimiter.core.keyresolver.impl.*; -import com.tashow.cloud.redis.config.RedisAutoConfiguration; +import com.tashow.cloud.redis.config.TashowRedisAutoConfiguration; import com.tashow.cloud.protection.ratelimiter.core.redis.RateLimiterRedisDAO; import org.redisson.api.RedissonClient; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Bean; import java.util.List; -@AutoConfiguration(after = RedisAutoConfiguration.class) +@AutoConfiguration(after = TashowRedisAutoConfiguration.class) public class RateLimiterConfiguration { @Bean diff --git a/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/signature/config/ApiSignatureAutoConfiguration.java b/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/signature/config/ApiSignatureAutoConfiguration.java index fcf1394..dbb4268 100644 --- a/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/signature/config/ApiSignatureAutoConfiguration.java +++ b/tashow-framework/tashow-framework-protection/src/main/java/com/tashow/cloud/protection/signature/config/ApiSignatureAutoConfiguration.java @@ -2,7 +2,7 @@ package com.tashow.cloud.protection.signature.config; import com.tashow.cloud.protection.signature.core.redis.ApiSignatureRedisDAO; import com.tashow.cloud.protection.signature.core.aop.ApiSignatureAspect; -import com.tashow.cloud.redis.config.RedisAutoConfiguration; +import com.tashow.cloud.redis.config.TashowRedisAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.core.StringRedisTemplate; @@ -12,7 +12,7 @@ import org.springframework.data.redis.core.StringRedisTemplate; * * @author Zhougang */ -@AutoConfiguration(after = RedisAutoConfiguration.class) +@AutoConfiguration(after = TashowRedisAutoConfiguration.class) public class ApiSignatureAutoConfiguration { @Bean diff --git a/tashow-framework/tashow-framework-security/pom.xml b/tashow-framework/tashow-framework-security/pom.xml index 8a3b31e..f327a7c 100644 --- a/tashow-framework/tashow-framework-security/pom.xml +++ b/tashow-framework/tashow-framework-security/pom.xml @@ -56,7 +56,7 @@ com.tashow.cloud - tashow-module-system-api + tashow-system-api ${revision} diff --git a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantAutoConfiguration.java b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantAutoConfiguration.java index 2771086..6112d02 100644 --- a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantAutoConfiguration.java +++ b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantAutoConfiguration.java @@ -1,17 +1,15 @@ package com.tashow.cloud.tenant.config; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; import com.tashow.cloud.common.enums.WebFilterOrderEnum; import com.tashow.cloud.mybatis.mybatis.core.util.MyBatisUtils; import com.tashow.cloud.redis.config.TashowCacheProperties; import com.tashow.cloud.systemapi.api.tenant.TenantApi; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; import com.tashow.cloud.tenant.core.aop.TenantIgnoreAspect; import com.tashow.cloud.tenant.core.db.TenantDatabaseInterceptor; import com.tashow.cloud.tenant.core.job.TenantJobAspect; import com.tashow.cloud.tenant.core.mq.rabbitmq.TenantRabbitMQInitializer; -import com.tashow.cloud.tenant.core.mq.redis.TenantRedisMessageInterceptor; -import com.tashow.cloud.tenant.core.mq.rocketmq.TenantRocketMQInitializer; import com.tashow.cloud.tenant.core.redis.TenantRedisCacheManager; import com.tashow.cloud.tenant.core.security.TenantSecurityWebFilter; import com.tashow.cloud.tenant.core.service.TenantFrameworkService; @@ -25,7 +23,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.data.redis.cache.BatchStrategies; import org.springframework.data.redis.cache.RedisCacheConfiguration; @@ -97,23 +94,6 @@ public class TenantAutoConfiguration { return new TenantJobAspect(tenantFrameworkService); } - // ========== MQ ========== - - /** - * 多租户 Redis 消息队列的配置类 - * - * 为什么要单独一个配置类呢？如果直接把 TenantRedisMessageInterceptor Bean 的初始化放外面，会报 RedisMessageInterceptor 类不存在的错误 - */ - @Configuration - @ConditionalOnClass(name = "com.tashow.cloud.mq.redis.core.RedisMQTemplate") - public static class TenantRedisMQAutoConfiguration { - - @Bean - public TenantRedisMessageInterceptor tenantRedisMessageInterceptor() { - return new TenantRedisMessageInterceptor(); - } - - } @Bean @ConditionalOnClass(name = "org.springframework.amqp.rabbit.core.RabbitTemplate") @@ -121,12 +101,6 @@ public class TenantAutoConfiguration { return new TenantRabbitMQInitializer(); } - @Bean - @ConditionalOnClass(name = "org.apache.rocketmq.spring.core.RocketMQTemplate") - public TenantRocketMQInitializer tenantRocketMQInitializer() { - return new TenantRocketMQInitializer(); - } - // ========== Redis ========== @Bean diff --git a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantRpcAutoConfiguration.java b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantRpcAutoConfiguration.java index 35447a9..c905345 100644 --- a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantRpcAutoConfiguration.java +++ b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantRpcAutoConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; @AutoConfiguration -@ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户 +@ConditionalOnProperty(prefix = "tashow.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户 @EnableFeignClients(clients = TenantApi.class) // 主要是引入相关的 API 服务 public class TenantRpcAutoConfiguration { diff --git a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/kafka/TenantKafkaEnvironmentPostProcessor.java b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/kafka/TenantKafkaEnvironmentPostProcessor.java deleted file mode 100644 index 71896db..0000000 --- a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/kafka/TenantKafkaEnvironmentPostProcessor.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.tashow.cloud.tenant.core.mq.kafka; - -import cn.hutool.core.util.StrUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.env.EnvironmentPostProcessor; -import org.springframework.core.env.ConfigurableEnvironment; - -/** - * 多租户的 Kafka 的 {@link EnvironmentPostProcessor} 实现类 - * - * Kafka Producer 发送消息时，增加 {@link TenantKafkaProducerInterceptor} 拦截器 - * - * @author 芋道源码 - */ -@Slf4j -public class TenantKafkaEnvironmentPostProcessor implements EnvironmentPostProcessor { - - private static final String PROPERTY_KEY_INTERCEPTOR_CLASSES = "spring.kafka.producer.properties.interceptor.classes"; - - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { - // 添加 TenantKafkaProducerInterceptor 拦截器 - try { - String value = environment.getProperty(PROPERTY_KEY_INTERCEPTOR_CLASSES); - if (StrUtil.isEmpty(value)) { - value = TenantKafkaProducerInterceptor.class.getName(); - } else { - value += "," + TenantKafkaProducerInterceptor.class.getName(); - } - environment.getSystemProperties().put(PROPERTY_KEY_INTERCEPTOR_CLASSES, value); - } catch (NoClassDefFoundError ignore) { - // 如果触发 NoClassDefFoundError 异常，说明 TenantKafkaProducerInterceptor 类不存在，即没引入 kafka-spring 依赖 - } - } - -} diff --git a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/kafka/TenantKafkaProducerInterceptor.java b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/kafka/TenantKafkaProducerInterceptor.java deleted file mode 100644 index b55e215..0000000 --- a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/kafka/TenantKafkaProducerInterceptor.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.tashow.cloud.tenant.core.mq.kafka; - -import cn.hutool.core.util.ReflectUtil; -import com.tashow.cloud.tenant.core.context.TenantContextHolder; -import org.apache.kafka.clients.producer.ProducerInterceptor; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.apache.kafka.clients.producer.RecordMetadata; -import org.apache.kafka.common.header.Headers; -import org.springframework.messaging.handler.invocation.InvocableHandlerMethod; - -import java.util.Map; - -import static com.tashow.cloud.web.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; - - -/** - * Kafka 消息队列的多租户 {@link ProducerInterceptor} 实现类 - * - * 1. Producer 发送消息时，将 {@link TenantContextHolder} 租户编号，添加到消息的 Header 中 - * 2. Consumer 消费消息时，将消息的 Header 的租户编号，添加到 {@link TenantContextHolder} 中，通过 {@link InvocableHandlerMethod} 实现 - * - * @author 芋道源码 - */ -public class TenantKafkaProducerInterceptor implements ProducerInterceptor { - - @Override - public ProducerRecord onSend(ProducerRecord record) { - Long tenantId = TenantContextHolder.getTenantId(); - if (tenantId != null) { - Headers headers = (Headers) ReflectUtil.getFieldValue(record, "headers"); // private 属性，没有 get 方法，智能反射 - headers.add(HEADER_TENANT_ID, tenantId.toString().getBytes()); - } - return record; - } - - @Override - public void onAcknowledgement(RecordMetadata metadata, Exception exception) { - } - - @Override - public void close() { - } - - @Override - public void configure(Map configs) { - } - -} diff --git a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/package-info.java b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/package-info.java new file mode 100644 index 0000000..3ba04e3 --- /dev/null +++ b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/package-info.java @@ -0,0 +1 @@ +package com.tashow.cloud.tenant.core.mq; \ No newline at end of file diff --git a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/redis/TenantRedisMessageInterceptor.java b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/redis/TenantRedisMessageInterceptor.java deleted file mode 100644 index e4f6e91..0000000 --- a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/redis/TenantRedisMessageInterceptor.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.tashow.cloud.tenant.core.mq.redis; - -import cn.hutool.core.util.StrUtil; -import com.tashow.cloud.mq.redis.core.interceptor.RedisMessageInterceptor; -import com.tashow.cloud.mq.redis.core.message.AbstractRedisMessage; -import com.tashow.cloud.tenant.core.context.TenantContextHolder; - -import static com.tashow.cloud.web.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; - - -/** - * 多租户 {@link AbstractRedisMessage} 拦截器 - * - * 1. Producer 发送消息时，将 {@link TenantContextHolder} 租户编号，添加到消息的 Header 中 - * 2. Consumer 消费消息时，将消息的 Header 的租户编号，添加到 {@link TenantContextHolder} 中 - * - * @author 芋道源码 - */ -public class TenantRedisMessageInterceptor implements RedisMessageInterceptor { - - @Override - public void sendMessageBefore(AbstractRedisMessage message) { - Long tenantId = TenantContextHolder.getTenantId(); - if (tenantId != null) { - message.addHeader(HEADER_TENANT_ID, tenantId.toString()); - } - } - - @Override - public void consumeMessageBefore(AbstractRedisMessage message) { - String tenantIdStr = message.getHeader(HEADER_TENANT_ID); - if (StrUtil.isNotEmpty(tenantIdStr)) { - TenantContextHolder.setTenantId(Long.valueOf(tenantIdStr)); - } - } - - @Override - public void consumeMessageAfter(AbstractRedisMessage message) { - // 注意，Consumer 是一个逻辑的入口，所以不考虑原本上下文就存在租户编号的情况 - TenantContextHolder.clear(); - } - -} diff --git a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/rocketmq/TenantRocketMQConsumeMessageHook.java b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/rocketmq/TenantRocketMQConsumeMessageHook.java deleted file mode 100644 index 83b4f5b..0000000 --- a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/rocketmq/TenantRocketMQConsumeMessageHook.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.tashow.cloud.tenant.core.mq.rocketmq; - -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.StrUtil; -import com.tashow.cloud.tenant.core.context.TenantContextHolder; -import org.apache.rocketmq.client.hook.ConsumeMessageContext; -import org.apache.rocketmq.client.hook.ConsumeMessageHook; -import org.apache.rocketmq.common.message.MessageExt; -import org.springframework.messaging.handler.invocation.InvocableHandlerMethod; - -import java.util.List; - -import static com.tashow.cloud.web.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; - - -/** - * RocketMQ 消息队列的多租户 {@link ConsumeMessageHook} 实现类 - * - * Consumer 消费消息时，将消息的 Header 的租户编号，添加到 {@link TenantContextHolder} 中，通过 {@link InvocableHandlerMethod} 实现 - * - * @author 芋道源码 - */ -public class TenantRocketMQConsumeMessageHook implements ConsumeMessageHook { - - @Override - public String hookName() { - return getClass().getSimpleName(); - } - - @Override - public void consumeMessageBefore(ConsumeMessageContext context) { - // 校验，消息必须是单条，不然设置租户可能不正确 - List messages = context.getMsgList(); - Assert.isTrue(messages.size() == 1, "消息条数({})不正确", messages.size()); - // 设置租户编号 - String tenantId = messages.get(0).getUserProperty(HEADER_TENANT_ID); - if (StrUtil.isNotEmpty(tenantId)) { - TenantContextHolder.setTenantId(Long.parseLong(tenantId)); - } - } - - @Override - public void consumeMessageAfter(ConsumeMessageContext context) { - TenantContextHolder.clear(); - } - -} diff --git a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/rocketmq/TenantRocketMQInitializer.java b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/rocketmq/TenantRocketMQInitializer.java deleted file mode 100644 index 601ede5..0000000 --- a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/rocketmq/TenantRocketMQInitializer.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.tashow.cloud.tenant.core.mq.rocketmq; - -import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer; -import org.apache.rocketmq.client.impl.consumer.DefaultMQPushConsumerImpl; -import org.apache.rocketmq.client.impl.producer.DefaultMQProducerImpl; -import org.apache.rocketmq.client.producer.DefaultMQProducer; -import org.apache.rocketmq.spring.core.RocketMQTemplate; -import org.apache.rocketmq.spring.support.DefaultRocketMQListenerContainer; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.BeanPostProcessor; - -/** - * 多租户的 RocketMQ 初始化器 - * - * @author 芋道源码 - */ -public class TenantRocketMQInitializer implements BeanPostProcessor { - - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { - if (bean instanceof DefaultRocketMQListenerContainer) { - DefaultRocketMQListenerContainer container = (DefaultRocketMQListenerContainer) bean; - initTenantConsumer(container.getConsumer()); - } else if (bean instanceof RocketMQTemplate) { - RocketMQTemplate template = (RocketMQTemplate) bean; - initTenantProducer(template.getProducer()); - } - return bean; - } - - private void initTenantProducer(DefaultMQProducer producer) { - if (producer == null) { - return; - } - DefaultMQProducerImpl producerImpl = producer.getDefaultMQProducerImpl(); - if (producerImpl == null) { - return; - } - producerImpl.registerSendMessageHook(new TenantRocketMQSendMessageHook()); - } - - private void initTenantConsumer(DefaultMQPushConsumer consumer) { - if (consumer == null) { - return; - } - DefaultMQPushConsumerImpl consumerImpl = consumer.getDefaultMQPushConsumerImpl(); - if (consumerImpl == null) { - return; - } - consumerImpl.registerConsumeMessageHook(new TenantRocketMQConsumeMessageHook()); - } - -} diff --git a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/rocketmq/TenantRocketMQSendMessageHook.java b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/rocketmq/TenantRocketMQSendMessageHook.java deleted file mode 100644 index fc99bcb..0000000 --- a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/mq/rocketmq/TenantRocketMQSendMessageHook.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.tashow.cloud.tenant.core.mq.rocketmq; - -import com.tashow.cloud.tenant.core.context.TenantContextHolder; -import org.apache.rocketmq.client.hook.SendMessageContext; -import org.apache.rocketmq.client.hook.SendMessageHook; - -import static com.tashow.cloud.web.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; - - -/** - * RocketMQ 消息队列的多租户 {@link SendMessageHook} 实现类 - * - * Producer 发送消息时，将 {@link TenantContextHolder} 租户编号，添加到消息的 Header 中 - * - * @author 芋道源码 - */ -public class TenantRocketMQSendMessageHook implements SendMessageHook { - - @Override - public String hookName() { - return getClass().getSimpleName(); - } - - @Override - public void sendMessageBefore(SendMessageContext sendMessageContext) { - Long tenantId = TenantContextHolder.getTenantId(); - if (tenantId == null) { - return; - } - sendMessageContext.getMessage().putUserProperty(HEADER_TENANT_ID, tenantId.toString()); - } - - @Override - public void sendMessageAfter(SendMessageContext sendMessageContext) { - } - -} diff --git a/tashow-framework/tashow-framework-tenant/src/main/resources/META-INF/spring.factories b/tashow-framework/tashow-framework-tenant/src/main/resources/META-INF/spring.factories deleted file mode 100644 index ddf705c..0000000 --- a/tashow-framework/tashow-framework-tenant/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.env.EnvironmentPostProcessor=\ - com.tashow.cloud.tenant.core.mq.kafka.TenantKafkaEnvironmentPostProcessor diff --git a/tashow-framework/tashow-framework-web/pom.xml b/tashow-framework/tashow-framework-web/pom.xml index ce6818e..65f89c9 100644 --- a/tashow-framework/tashow-framework-web/pom.xml +++ b/tashow-framework/tashow-framework-web/pom.xml @@ -63,13 +63,11 @@ com.tashow.cloud - tashow-module-infra-api - ${revision} + tashow-infra-api com.tashow.cloud - tashow-module-system-api - ${revision} + tashow-system-api diff --git a/tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/web/config/WebProperties.java b/tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/web/config/WebProperties.java index 887e0fc..00455f2 100644 --- a/tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/web/config/WebProperties.java +++ b/tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/web/config/WebProperties.java @@ -20,9 +20,6 @@ public class WebProperties { @NotNull(message = "Admin API 不能为空") private Api adminApi = new Api("/admin-api", "**.controller.admin.**"); - @NotNull(message = "Admin UI 不能为空") - private Ui adminUi; - @Data @AllArgsConstructor @NoArgsConstructor @@ -51,15 +48,4 @@ public class WebProperties { } - @Data - @Valid - public static class Ui { - - /** - * 访问地址 - */ - private String url; - - } - } diff --git a/tashow-framework/tashow-framework-websocket/pom.xml b/tashow-framework/tashow-framework-websocket/pom.xml index 3e234e0..4757c29 100644 --- a/tashow-framework/tashow-framework-websocket/pom.xml +++ b/tashow-framework/tashow-framework-websocket/pom.xml @@ -42,21 +42,11 @@ com.tashow.cloud tashow-framework-mq - - org.springframework.kafka - spring-kafka - true - org.springframework.amqp spring-rabbit true - - org.apache.rocketmq - rocketmq-spring-boot-starter - true - diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/config/WebSocketAutoConfiguration.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/config/WebSocketAutoConfiguration.java index 639719a..3180f49 100644 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/config/WebSocketAutoConfiguration.java +++ b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/config/WebSocketAutoConfiguration.java @@ -1,24 +1,15 @@ package com.tashow.cloud.websocket.config; -import com.tashow.cloud.mq.redis.config.RedisMQConsumerAutoConfiguration; -import com.tashow.cloud.mq.redis.core.RedisMQTemplate; import com.tashow.cloud.websocket.core.handler.JsonWebSocketMessageHandler; import com.tashow.cloud.websocket.core.listener.WebSocketMessageListener; import com.tashow.cloud.websocket.core.security.LoginUserHandshakeInterceptor; import com.tashow.cloud.websocket.core.security.WebSocketAuthorizeRequestsCustomizer; -import com.tashow.cloud.websocket.core.sender.kafka.KafkaWebSocketMessageConsumer; -import com.tashow.cloud.websocket.core.sender.kafka.KafkaWebSocketMessageSender; import com.tashow.cloud.websocket.core.sender.local.LocalWebSocketMessageSender; import com.tashow.cloud.websocket.core.sender.rabbitmq.RabbitMQWebSocketMessageConsumer; import com.tashow.cloud.websocket.core.sender.rabbitmq.RabbitMQWebSocketMessageSender; -import com.tashow.cloud.websocket.core.sender.redis.RedisWebSocketMessageConsumer; -import com.tashow.cloud.websocket.core.sender.redis.RedisWebSocketMessageSender; -import com.tashow.cloud.websocket.core.sender.rocketmq.RocketMQWebSocketMessageConsumer; -import com.tashow.cloud.websocket.core.sender.rocketmq.RocketMQWebSocketMessageSender; import com.tashow.cloud.websocket.core.session.WebSocketSessionHandlerDecorator; import com.tashow.cloud.websocket.core.session.WebSocketSessionManager; import com.tashow.cloud.websocket.core.session.WebSocketSessionManagerImpl; -import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.amqp.core.TopicExchange; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Value; @@ -27,7 +18,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.kafka.core.KafkaTemplate; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.config.annotation.EnableWebSocket; import org.springframework.web.socket.config.annotation.WebSocketConfigurer; @@ -40,9 +30,9 @@ import java.util.List; * * @author xingyu4j */ -@AutoConfiguration(before = RedisMQConsumerAutoConfiguration.class) // before YudaoRedisMQConsumerAutoConfiguration 的原因是，需要保证 RedisWebSocketMessageConsumer 先创建，才能创建 RedisMessageListenerContainer +@AutoConfiguration @EnableWebSocket // 开启 websocket -@ConditionalOnProperty(prefix = "yudao.websocket", value = "enable", matchIfMissing = true) // 允许使用 yudao.websocket.enable=false 禁用 websocket +@ConditionalOnProperty(prefix = "tashow.websocket", value = "enable", matchIfMissing = true) // 允许使用 yudao.websocket.enable=false 禁用 websocket @EnableConfigurationProperties(WebSocketProperties.class) public class WebSocketAutoConfiguration { @@ -96,44 +86,7 @@ public class WebSocketAutoConfiguration { } @Configuration - @ConditionalOnProperty(prefix = "tashow.websocket", name = "sender-type", havingValue = "redis") - public class RedisWebSocketMessageSenderConfiguration { - - @Bean - public RedisWebSocketMessageSender redisWebSocketMessageSender(WebSocketSessionManager sessionManager, - RedisMQTemplate redisMQTemplate) { - return new RedisWebSocketMessageSender(sessionManager, redisMQTemplate); - } - - @Bean - public RedisWebSocketMessageConsumer redisWebSocketMessageConsumer( - RedisWebSocketMessageSender redisWebSocketMessageSender) { - return new RedisWebSocketMessageConsumer(redisWebSocketMessageSender); - } - - } - - @Configuration - @ConditionalOnProperty(prefix = "tashow.websocket", name = "sender-type", havingValue = "rocketmq") - public class RocketMQWebSocketMessageSenderConfiguration { - - @Bean - public RocketMQWebSocketMessageSender rocketMQWebSocketMessageSender( - WebSocketSessionManager sessionManager, RocketMQTemplate rocketMQTemplate, - @Value("${yudao.websocket.sender-rocketmq.topic}") String topic) { - return new RocketMQWebSocketMessageSender(sessionManager, rocketMQTemplate, topic); - } - - @Bean - public RocketMQWebSocketMessageConsumer rocketMQWebSocketMessageConsumer( - RocketMQWebSocketMessageSender rocketMQWebSocketMessageSender) { - return new RocketMQWebSocketMessageConsumer(rocketMQWebSocketMessageSender); - } - - } - - @Configuration - @ConditionalOnProperty(prefix = "yudao.websocket", name = "sender-type", havingValue = "rabbitmq") + @ConditionalOnProperty(prefix = "tashow.websocket", name = "sender-type", havingValue = "rabbitmq") public class RabbitMQWebSocketMessageSenderConfiguration { @Bean @@ -153,7 +106,7 @@ public class WebSocketAutoConfiguration { * 创建 Topic Exchange */ @Bean - public TopicExchange websocketTopicExchange(@Value("${yudao.websocket.sender-rabbitmq.exchange}") String exchange) { + public TopicExchange websocketTopicExchange(@Value("${tashow.websocket.sender-rabbitmq.exchange}") String exchange) { return new TopicExchange(exchange, true, // durable: 是否持久化 false); // exclusive: 是否排它 @@ -161,23 +114,4 @@ public class WebSocketAutoConfiguration { } - @Configuration - @ConditionalOnProperty(prefix = "tashow.websocket", name = "sender-type", havingValue = "kafka") - public class KafkaWebSocketMessageSenderConfiguration { - - @Bean - public KafkaWebSocketMessageSender kafkaWebSocketMessageSender( - WebSocketSessionManager sessionManager, KafkaTemplate kafkaTemplate, - @Value("${yudao.websocket.sender-kafka.topic}") String topic) { - return new KafkaWebSocketMessageSender(sessionManager, kafkaTemplate, topic); - } - - @Bean - public KafkaWebSocketMessageConsumer kafkaWebSocketMessageConsumer( - KafkaWebSocketMessageSender kafkaWebSocketMessageSender) { - return new KafkaWebSocketMessageConsumer(kafkaWebSocketMessageSender); - } - - } - } diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessage.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessage.java deleted file mode 100644 index 9ba2d90..0000000 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessage.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.tashow.cloud.websocket.core.sender.kafka; - -import lombok.Data; - -/** - * Kafka 广播 WebSocket 的消息 - * - * @author 芋道源码 - */ -@Data -public class KafkaWebSocketMessage { - - /** - * Session 编号 - */ - private String sessionId; - /** - * 用户类型 - */ - private Integer userType; - /** - * 用户编号 - */ - private Long userId; - - /** - * 消息类型 - */ - private String messageType; - /** - * 消息内容 - */ - private String messageContent; - -} diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessageConsumer.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessageConsumer.java deleted file mode 100644 index 44b13c2..0000000 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessageConsumer.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.tashow.cloud.websocket.core.sender.kafka; - -import lombok.RequiredArgsConstructor; -import org.springframework.amqp.rabbit.annotation.RabbitHandler; -import org.springframework.kafka.annotation.KafkaListener; - -/** - * {@link KafkaWebSocketMessage} 广播消息的消费者，真正把消息发送出去 - * - * @author 芋道源码 - */ -@RequiredArgsConstructor -public class KafkaWebSocketMessageConsumer { - - private final KafkaWebSocketMessageSender kafkaWebSocketMessageSender; - - @RabbitHandler - @KafkaListener( - topics = "${yudao.websocket.sender-kafka.topic}", - // 在 Group 上，使用 UUID 生成其后缀。这样，启动的 Consumer 的 Group 不同，以达到广播消费的目的 - groupId = "${yudao.websocket.sender-kafka.consumer-group}" + "-" + "#{T(java.util.UUID).randomUUID()}") - public void onMessage(KafkaWebSocketMessage message) { - kafkaWebSocketMessageSender.send(message.getSessionId(), - message.getUserType(), message.getUserId(), - message.getMessageType(), message.getMessageContent()); - } - -} diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessageSender.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessageSender.java deleted file mode 100644 index ccbd632..0000000 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/kafka/KafkaWebSocketMessageSender.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.tashow.cloud.websocket.core.sender.kafka; - -import com.tashow.cloud.websocket.core.sender.AbstractWebSocketMessageSender; -import com.tashow.cloud.websocket.core.sender.WebSocketMessageSender; -import com.tashow.cloud.websocket.core.session.WebSocketSessionManager; -import lombok.extern.slf4j.Slf4j; -import org.springframework.kafka.core.KafkaTemplate; - -import java.util.concurrent.ExecutionException; - -/** - * 基于 Kafka 的 {@link WebSocketMessageSender} 实现类 - * - * @author 芋道源码 - */ -@Slf4j -public class KafkaWebSocketMessageSender extends AbstractWebSocketMessageSender { - - private final KafkaTemplate kafkaTemplate; - - private final String topic; - - public KafkaWebSocketMessageSender(WebSocketSessionManager sessionManager, - KafkaTemplate kafkaTemplate, - String topic) { - super(sessionManager); - this.kafkaTemplate = kafkaTemplate; - this.topic = topic; - } - - @Override - public void send(Integer userType, Long userId, String messageType, String messageContent) { - sendKafkaMessage(null, userId, userType, messageType, messageContent); - } - - @Override - public void send(Integer userType, String messageType, String messageContent) { - sendKafkaMessage(null, null, userType, messageType, messageContent); - } - - @Override - public void send(String sessionId, String messageType, String messageContent) { - sendKafkaMessage(sessionId, null, null, messageType, messageContent); - } - - /** - * 通过 Kafka 广播消息 - * - * @param sessionId Session 编号 - * @param userId 用户编号 - * @param userType 用户类型 - * @param messageType 消息类型 - * @param messageContent 消息内容 - */ - private void sendKafkaMessage(String sessionId, Long userId, Integer userType, - String messageType, String messageContent) { - KafkaWebSocketMessage mqMessage = new KafkaWebSocketMessage() - .setSessionId(sessionId).setUserId(userId).setUserType(userType) - .setMessageType(messageType).setMessageContent(messageContent); - try { - kafkaTemplate.send(topic, mqMessage).get(); - } catch (InterruptedException | ExecutionException e) { - log.error("[sendKafkaMessage][发送消息({}) 到 Kafka 失败]", mqMessage, e); - } - } - -} diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rabbitmq/RabbitMQWebSocketMessageConsumer.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rabbitmq/RabbitMQWebSocketMessageConsumer.java index 9de0e64..3f30c80 100644 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rabbitmq/RabbitMQWebSocketMessageConsumer.java +++ b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rabbitmq/RabbitMQWebSocketMessageConsumer.java @@ -13,12 +13,12 @@ import org.springframework.amqp.rabbit.annotation.*; bindings = @QueueBinding( value = @Queue( // 在 Queue 的名字上，使用 UUID 生成其后缀。这样，启动的 Consumer 的 Queue 不同，以达到广播消费的目的 - name = "${yudao.websocket.sender-rabbitmq.queue}" + "-" + "#{T(java.util.UUID).randomUUID()}", + name = "${tashow.websocket.sender-rabbitmq.queue}" + "-" + "#{T(java.util.UUID).randomUUID()}", // Consumer 关闭时，该队列就可以被自动删除了 autoDelete = "true" ), exchange = @Exchange( - name = "${yudao.websocket.sender-rabbitmq.exchange}", + name = "${tashow.websocket.sender-rabbitmq.exchange}", type = ExchangeTypes.TOPIC, declare = "false" ) diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessage.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessage.java deleted file mode 100644 index 68d694b..0000000 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessage.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.tashow.cloud.websocket.core.sender.redis; - -import com.tashow.cloud.mq.redis.core.pubsub.AbstractRedisChannelMessage; -import lombok.Data; - -/** - * Redis 广播 WebSocket 的消息 - */ -@Data -public class RedisWebSocketMessage extends AbstractRedisChannelMessage { - - /** - * Session 编号 - */ - private String sessionId; - /** - * 用户类型 - */ - private Integer userType; - /** - * 用户编号 - */ - private Long userId; - - /** - * 消息类型 - */ - private String messageType; - /** - * 消息内容 - */ - private String messageContent; - -} diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessageConsumer.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessageConsumer.java deleted file mode 100644 index 0991062..0000000 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessageConsumer.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.tashow.cloud.websocket.core.sender.redis; - -import com.tashow.cloud.mq.redis.core.pubsub.AbstractRedisChannelMessageListener; -import lombok.RequiredArgsConstructor; - -/** - * {@link RedisWebSocketMessage} 广播消息的消费者，真正把消息发送出去 - * - * @author 芋道源码 - */ -@RequiredArgsConstructor -public class RedisWebSocketMessageConsumer extends AbstractRedisChannelMessageListener { - - private final RedisWebSocketMessageSender redisWebSocketMessageSender; - - @Override - public void onMessage(RedisWebSocketMessage message) { - redisWebSocketMessageSender.send(message.getSessionId(), - message.getUserType(), message.getUserId(), - message.getMessageType(), message.getMessageContent()); - } - -} diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessageSender.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessageSender.java deleted file mode 100644 index d31e5a1..0000000 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/redis/RedisWebSocketMessageSender.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.tashow.cloud.websocket.core.sender.redis; - -import com.tashow.cloud.mq.redis.core.RedisMQTemplate; -import com.tashow.cloud.websocket.core.sender.AbstractWebSocketMessageSender; -import com.tashow.cloud.websocket.core.sender.WebSocketMessageSender; -import com.tashow.cloud.websocket.core.session.WebSocketSessionManager; -import lombok.extern.slf4j.Slf4j; - -/** - * 基于 Redis 的 {@link WebSocketMessageSender} 实现类 - * - * @author 芋道源码 - */ -@Slf4j -public class RedisWebSocketMessageSender extends AbstractWebSocketMessageSender { - - private final RedisMQTemplate redisMQTemplate; - - public RedisWebSocketMessageSender(WebSocketSessionManager sessionManager, - RedisMQTemplate redisMQTemplate) { - super(sessionManager); - this.redisMQTemplate = redisMQTemplate; - } - - @Override - public void send(Integer userType, Long userId, String messageType, String messageContent) { - sendRedisMessage(null, userId, userType, messageType, messageContent); - } - - @Override - public void send(Integer userType, String messageType, String messageContent) { - sendRedisMessage(null, null, userType, messageType, messageContent); - } - - @Override - public void send(String sessionId, String messageType, String messageContent) { - sendRedisMessage(sessionId, null, null, messageType, messageContent); - } - - /** - * 通过 Redis 广播消息 - * - * @param sessionId Session 编号 - * @param userId 用户编号 - * @param userType 用户类型 - * @param messageType 消息类型 - * @param messageContent 消息内容 - */ - private void sendRedisMessage(String sessionId, Long userId, Integer userType, - String messageType, String messageContent) { - RedisWebSocketMessage mqMessage = new RedisWebSocketMessage() - .setSessionId(sessionId).setUserId(userId).setUserType(userType) - .setMessageType(messageType).setMessageContent(messageContent); - redisMQTemplate.send(mqMessage); - } - -} diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessage.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessage.java deleted file mode 100644 index acda3aa..0000000 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessage.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.tashow.cloud.websocket.core.sender.rocketmq; - -import lombok.Data; - -/** - * RocketMQ 广播 WebSocket 的消息 - * - * @author 芋道源码 - */ -@Data -public class RocketMQWebSocketMessage { - - /** - * Session 编号 - */ - private String sessionId; - /** - * 用户类型 - */ - private Integer userType; - /** - * 用户编号 - */ - private Long userId; - - /** - * 消息类型 - */ - private String messageType; - /** - * 消息内容 - */ - private String messageContent; - -} diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessageConsumer.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessageConsumer.java deleted file mode 100644 index 09c012e..0000000 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessageConsumer.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.tashow.cloud.websocket.core.sender.rocketmq; - -import lombok.RequiredArgsConstructor; -import org.apache.rocketmq.spring.annotation.MessageModel; -import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; -import org.apache.rocketmq.spring.core.RocketMQListener; - -/** - * {@link RocketMQWebSocketMessage} 广播消息的消费者，真正把消息发送出去 - * - * @author 芋道源码 - */ -@RocketMQMessageListener( // 重点：添加 @RocketMQMessageListener 注解，声明消费的 topic - topic = "${yudao.websocket.sender-rocketmq.topic}", - consumerGroup = "${yudao.websocket.sender-rocketmq.consumer-group}", - messageModel = MessageModel.BROADCASTING // 设置为广播模式，保证每个实例都能收到消息 -) -@RequiredArgsConstructor -public class RocketMQWebSocketMessageConsumer implements RocketMQListener { - - private final RocketMQWebSocketMessageSender rocketMQWebSocketMessageSender; - - @Override - public void onMessage(RocketMQWebSocketMessage message) { - rocketMQWebSocketMessageSender.send(message.getSessionId(), - message.getUserType(), message.getUserId(), - message.getMessageType(), message.getMessageContent()); - } - -} diff --git a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessageSender.java b/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessageSender.java deleted file mode 100644 index d097156..0000000 --- a/tashow-framework/tashow-framework-websocket/src/main/java/com/tashow/cloud/websocket/core/sender/rocketmq/RocketMQWebSocketMessageSender.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.tashow.cloud.websocket.core.sender.rocketmq; - -import com.tashow.cloud.websocket.core.sender.AbstractWebSocketMessageSender; -import com.tashow.cloud.websocket.core.sender.WebSocketMessageSender; -import com.tashow.cloud.websocket.core.session.WebSocketSessionManager; -import com.tashow.cloud.websocket.core.sender.AbstractWebSocketMessageSender; -import com.tashow.cloud.websocket.core.sender.WebSocketMessageSender; -import com.tashow.cloud.websocket.core.session.WebSocketSessionManager; -import lombok.extern.slf4j.Slf4j; -import org.apache.rocketmq.spring.core.RocketMQTemplate; - -/** - * 基于 RocketMQ 的 {@link WebSocketMessageSender} 实现类 - * - * @author 芋道源码 - */ -@Slf4j -public class RocketMQWebSocketMessageSender extends AbstractWebSocketMessageSender { - - private final RocketMQTemplate rocketMQTemplate; - - private final String topic; - - public RocketMQWebSocketMessageSender(WebSocketSessionManager sessionManager, - RocketMQTemplate rocketMQTemplate, - String topic) { - super(sessionManager); - this.rocketMQTemplate = rocketMQTemplate; - this.topic = topic; - } - - @Override - public void send(Integer userType, Long userId, String messageType, String messageContent) { - sendRocketMQMessage(null, userId, userType, messageType, messageContent); - } - - @Override - public void send(Integer userType, String messageType, String messageContent) { - sendRocketMQMessage(null, null, userType, messageType, messageContent); - } - - @Override - public void send(String sessionId, String messageType, String messageContent) { - sendRocketMQMessage(sessionId, null, null, messageType, messageContent); - } - - /** - * 通过 RocketMQ 广播消息 - * - * @param sessionId Session 编号 - * @param userId 用户编号 - * @param userType 用户类型 - * @param messageType 消息类型 - * @param messageContent 消息内容 - */ - private void sendRocketMQMessage(String sessionId, Long userId, Integer userType, - String messageType, String messageContent) { - RocketMQWebSocketMessage mqMessage = new RocketMQWebSocketMessage() - .setSessionId(sessionId).setUserId(userId).setUserType(userType) - .setMessageType(messageType).setMessageContent(messageContent); - rocketMQTemplate.syncSend(topic, mqMessage); - } - -} diff --git a/tashow-gateway/pom.xml b/tashow-gateway/pom.xml index 7e79ccf..14e52be 100644 --- a/tashow-gateway/pom.xml +++ b/tashow-gateway/pom.xml @@ -18,7 +18,7 @@ com.tashow.cloud - tashow-module-system-api + tashow-system-api ${revision} diff --git a/tashow-gateway/src/main/resources/application-local.yaml b/tashow-gateway/src/main/resources/application-local.yaml index 59b8b16..afff069 100644 --- a/tashow-gateway/src/main/resources/application-local.yaml +++ b/tashow-gateway/src/main/resources/application-local.yaml @@ -7,10 +7,10 @@ spring: username: nacos # Nacos 账号 password: nacos # Nacos 密码 discovery: # 【配置中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: liwq # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP config: # 【注册中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: liwq # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP # 日志文件配置 diff --git a/tashow-gateway/src/main/resources/application.yaml b/tashow-gateway/src/main/resources/application.yaml index 9dbc292..ab8de4e 100644 --- a/tashow-gateway/src/main/resources/application.yaml +++ b/tashow-gateway/src/main/resources/application.yaml @@ -10,12 +10,6 @@ spring: config: import: - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 + - optional:nacos:application.yaml # 加载【Nacos】的配置 - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 ---- #################### 芋道相关配置 #################### -tashow: - info: - version: 1.0.0 diff --git a/tashow-module/pom.xml b/tashow-module/pom.xml index c9c419d..37c811b 100644 --- a/tashow-module/pom.xml +++ b/tashow-module/pom.xml @@ -13,7 +13,7 @@ tashow-module-system tashow-module-infra - tashow-module-sso + tashow-module-app diff --git a/tashow-module/tashow-module-app/pom.xml b/tashow-module/tashow-module-app/pom.xml new file mode 100644 index 0000000..250d8ad --- /dev/null +++ b/tashow-module/tashow-module-app/pom.xml @@ -0,0 +1,68 @@ + + 4.0.0 + + com.tashow.cloud + tashow-module + ${revision} + + + tashow-module-app + jar + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.tashow.cloud + tashow-framework-rpc + + + com.tashow.cloud + tashow-data-mybatis + + + com.tashow.cloud + tashow-framework-web + + + com.tashow.cloud + tashow-framework-env + + + com.tashow.cloud + tashow-infra-api + + + + + com.tashow.cloud + tashow-framework-websocket + + + com.tashow.cloud + tashow-data-redis + + + com.tashow.cloud + tashow-framework-security + + + org.springframework.boot + spring-boot-starter-actuator + + + + + diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/AppServerApplication.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/AppServerApplication.java new file mode 100644 index 0000000..24f14a9 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/AppServerApplication.java @@ -0,0 +1,16 @@ +package com.tashow.cloud.app; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * Hello world! + * + */ +@SpringBootApplication +public class AppServerApplication { + + public static void main(String[] args) { + SpringApplication.run(AppServerApplication.class, args); + } +} diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/controller/LoginController.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/controller/LoginController.java new file mode 100644 index 0000000..216bbfe --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/controller/LoginController.java @@ -0,0 +1,4 @@ +package com.tashow.cloud.app.controller; + +public class LoginController { +} diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/controller/TestController.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/controller/TestController.java new file mode 100644 index 0000000..83c962c --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/controller/TestController.java @@ -0,0 +1,47 @@ +package com.tashow.cloud.app.controller; + +import com.tashow.cloud.app.mq.annotation.BuriedPoint; +import com.tashow.cloud.app.mq.mapper.BuriedPointMapper; +import com.tashow.cloud.app.mq.message.BuriedMessages; +import com.tashow.cloud.app.mq.producer.buriedPoint.BuriedPointProducer; +import jakarta.annotation.security.PermitAll; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 测试控制器 + */ +@RestController +@RequiredArgsConstructor +public class TestController { + + private final BuriedPointProducer buriedPointProducer; + private final BuriedPointMapper buriedPointMapper; + + /** + * 基础测试接口 + */ + @GetMapping("/test") + @PermitAll + public String test() { + return "test"; + } + + /** + * 测试埋点拦截器 + * 这个接口会被埋点拦截器自动记录请求信息 + */ + @GetMapping("/test/buried-point") + @PermitAll + public Map testBuriedPoint() { + Map result = new HashMap<>(); + result.put("success", true); + result.put("message", "埋点拦截器测试成功"); + return result; + } + +} diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/dataobject/package-info.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/dataobject/package-info.java new file mode 100644 index 0000000..fffab69 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/dataobject/package-info.java @@ -0,0 +1,2 @@ +package com.tashow.cloud.app.dal.dataobject; +// 数据库对象 \ No newline at end of file diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/dto/package-info.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/dto/package-info.java new file mode 100644 index 0000000..0cc6509 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/dto/package-info.java @@ -0,0 +1,2 @@ +package com.tashow.cloud.app.dal.dto; +// 视图层与业务层传输对象 \ No newline at end of file diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/package-info.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/package-info.java new file mode 100644 index 0000000..8f128a7 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/package-info.java @@ -0,0 +1 @@ +package com.tashow.cloud.app.dal; \ No newline at end of file diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/vo/package-info.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/vo/package-info.java new file mode 100644 index 0000000..94b57c5 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/dal/vo/package-info.java @@ -0,0 +1,2 @@ +package com.tashow.cloud.app.dal.vo; +// 视图参数接收 \ No newline at end of file diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/config/BuriedPointConfiguration.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/config/BuriedPointConfiguration.java new file mode 100644 index 0000000..6cef054 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/config/BuriedPointConfiguration.java @@ -0,0 +1,114 @@ +package com.tashow.cloud.app.mq.config; +import com.tashow.cloud.app.mq.interceptor.BuriedPointInterceptor; +import com.tashow.cloud.app.mq.message.BuriedMessages; +import com.tashow.cloud.app.mq.producer.buriedPoint.BuriedPointProducer; +import lombok.RequiredArgsConstructor; +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.DirectExchange; +import org.springframework.amqp.core.Queue; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import lombok.extern.slf4j.Slf4j; +import jakarta.annotation.PostConstruct; + +/** + * 埋点功能配置类 + */ +@Slf4j +@Configuration +@RequiredArgsConstructor +public class BuriedPointConfiguration implements WebMvcConfigurer { + + private final BuriedPointProducer buriedPointProducer; + private final RabbitTemplate rabbitTemplate; + + /** + * RabbitTemplate初始化配置 + * 确保回调正确配置，以实现消息可靠性 + */ +// @PostConstruct +// public void initRabbitTemplate() { +// log.info("[埋点配置] 初始化RabbitTemplate: {}", rabbitTemplate); +// rabbitTemplate.setMandatory(true); +// rabbitTemplate.setReturnsCallback(returned -> { +// log.error("[埋点配置] 消息路由失败: exchange={}, routingKey={}, replyCode={}, replyText={}, message={}", +// returned.getExchange(), +// returned.getRoutingKey(), +// returned.getReplyCode(), +// returned.getReplyText(), +// new String(returned.getMessage().getBody())); +// }); +// rabbitTemplate.setConfirmCallback((correlationData, ack, cause) -> { +// if (ack) { +// log.debug("[埋点配置] 消息成功发送到交换机: {}", correlationData); +// } else { +// log.error("[埋点配置] 消息发送到交换机失败: cause={}, correlationData={}", cause, correlationData); +// } +// }); +// +// // 验证配置 +// if (rabbitTemplate.isConfirmListener()) { +// log.info("[埋点配置] 确认回调已正确配置"); +// } else { +// log.error("[埋点配置] 确认回调配置失败，请检查RabbitMQ配置！"); +// } +// } + + /** + * 创建埋点队列 + */ + @Bean + public Queue buriedPointQueue() { + return new Queue(BuriedMessages.QUEUE, true, false, false); + } + + /** + * 创建埋点交换机 + */ + @Bean + public DirectExchange buriedPointExchange() { + return new DirectExchange(BuriedMessages.EXCHANGE, true, false); + } + + /** + * 创建埋点绑定关系 + */ + @Bean + public Binding buriedPointBinding() { + return BindingBuilder.bind(buriedPointQueue()) + .to(buriedPointExchange()) + .with(BuriedMessages.ROUTING_KEY); + } + + /** + * 创建埋点拦截器 + */ + @Bean + public BuriedPointInterceptor buriedPointInterceptor() { + return new BuriedPointInterceptor(buriedPointProducer); + } + + /** + * 注册埋点拦截器 + */ + @Override + public void addInterceptors(InterceptorRegistry registry) { + // 注册拦截器，拦截所有请求 + registry.addInterceptor(buriedPointInterceptor()) + // 可以根据需要添加或排除特定路径 + .addPathPatterns("/**") + // 排除静态资源、Swagger等路径 + .excludePathPatterns( + "/swagger-ui/**", + "/swagger-resources/**", + "/v3/api-docs/**", + "/webjars/**", + "/static/**", + "/error" + ); + } +} \ No newline at end of file diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/consumer/buriedPoint/BuriedPointConsumer.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/consumer/buriedPoint/BuriedPointConsumer.java new file mode 100644 index 0000000..3a7d5d0 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/consumer/buriedPoint/BuriedPointConsumer.java @@ -0,0 +1,118 @@ +/* +package com.tashow.cloud.app.mq.consumer.buriedPoint; +import com.tashow.cloud.app.mq.mapper.BuriedPointMapper; +import com.tashow.cloud.app.mq.message.BuriedMessages; +import com.tashow.cloud.app.mq.model.BuriedPoint; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.annotation.RabbitHandler; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.support.AmqpHeaders; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.messaging.handler.annotation.Header; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import java.io.IOException; +import java.util.Date; +import com.rabbitmq.client.Channel; +*/ +/** + * 埋点消息消费者 + * 将埋点数据存储到数据库 + *//* + +@Component +@RabbitListener(queues = BuriedMessages.QUEUE) +@Slf4j +@RequiredArgsConstructor +public class BuriedPointConsumer { + + private final BuriedPointMapper buriedPointMapper; + + @Value("${spring.application.name:tashow-app}") + private String applicationName; + + */ +/** + * 处理埋点消息 + *//* + + @RabbitHandler + public void onMessage(BuriedMessages message, + Channel channel, + @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) { + try { + log.info("[埋点消费者] 收到埋点消息: {}", message); + + // 确保事件ID不为空 + if (message.getId() == null) { + message.setId((int)(System.currentTimeMillis() % Integer.MAX_VALUE)); + log.warn("[埋点消费者] 消息中的事件ID为空，已自动生成: {}", message.getId()); + } + saveToDatabase(message); + channel.basicAck(deliveryTag, false); + log.info("[埋点消费者] 消息处理成功，已确认"); + + } catch (Exception e) { + try { + channel.basicNack(deliveryTag, false, true); + } catch (IOException ex) { + log.error("[埋点消费者] 拒绝消息失败", ex); + } + } + + } + + + + */ +/** + * 将埋点数据保存到数据库 + *//* + + private void saveToDatabase(BuriedMessages message) { + try { + log.debug("[埋点消费者] 准备保存埋点数据，事件ID: {}", message.getId()); + + // 转换消息为实体 + BuriedPoint buriedPoint = new BuriedPoint(); + + // 设置必填字段，确保不为空 + buriedPoint.setEventId(message.getId()); + buriedPoint.setEventTime(message.getEventTime()); + + // 获取真实用户ID，避免使用默认anonymous + String userId = message.getUserId(); + buriedPoint.setUserId(StringUtils.hasText(userId) && !"null".equals(userId) ? userId : "anonymous"); + + String eventType = message.getEventType(); + buriedPoint.setEventType(eventType); + buriedPoint.setService(applicationName); + + // 设置method字段，确保获取真实方法名 + buriedPoint.setMethod(message.getMethod()); + buriedPoint.setSessionId(message.getSessionId()); + buriedPoint.setClientIp(message.getClientIp()); + buriedPoint.setServerIp(message.getServerIp()); + + // 设置其他字段 + buriedPoint.setPagePath(message.getPagePath()); + buriedPoint.setElementId(message.getElementId()); + buriedPoint.setDuration(message.getDuration()); + + buriedPoint.setCreateTime(new Date()); + + log.debug("[埋点消费者] 埋点实体数据: eventId={}, eventType={}, userId={}, service={}, method={}", + buriedPoint.getEventId(), buriedPoint.getEventType(), + buriedPoint.getUserId(), buriedPoint.getService(), buriedPoint.getMethod()); + + int result = buriedPointMapper.insert(buriedPoint); + + log.info("[埋点消费者] 埋点数据已保存到数据库, 事件ID: {}, 影响行数: {}", message.getId(), result); + } catch (Exception e) { + log.error("[埋点消费者] 保存埋点数据到数据库失败, 事件ID: {}, 错误: {}", + message.getId(), e.getMessage(), e); + } + } +} */ diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/interceptor/BuriedPointInterceptor.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/interceptor/BuriedPointInterceptor.java new file mode 100644 index 0000000..50b0e98 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/interceptor/BuriedPointInterceptor.java @@ -0,0 +1,103 @@ +package com.tashow.cloud.app.mq.interceptor; + +import cn.hutool.core.util.IdUtil; +import com.tashow.cloud.app.mq.message.BuriedMessages; +import com.tashow.cloud.app.mq.producer.buriedPoint.BuriedPointProducer; +import com.tashow.cloud.common.util.json.JsonUtils; +import com.tashow.cloud.common.util.servlet.ServletUtils; +import com.tashow.cloud.common.util.spring.SpringUtils; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StopWatch; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerInterceptor; + +import java.net.InetAddress; +import java.net.UnknownHostException; + +/** + * 后端静默埋点拦截器 + * 用于收集API请求信息并异步发送到消息队列 + */ +@Slf4j +@RequiredArgsConstructor +public class BuriedPointInterceptor implements HandlerInterceptor { + + private final BuriedPointProducer buriedPointProducer; + + private static final String ATTRIBUTE_STOPWATCH = "BuriedPoint.StopWatch"; + private static final String ATTRIBUTE_REQUEST_ID = "BuriedPoint.RequestId"; + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { + if (!(handler instanceof HandlerMethod)) { + return true; + } + + try { + // 开始计时 + StopWatch stopWatch = new StopWatch(); + stopWatch.start(); + request.setAttribute(ATTRIBUTE_STOPWATCH, stopWatch); + + // 生成请求ID + int requestId = (int)(Math.abs(IdUtil.getSnowflakeNextId()) % Integer.MAX_VALUE); + request.setAttribute(ATTRIBUTE_REQUEST_ID, requestId); + + // 收集埋点数据 + HandlerMethod handlerMethod = (HandlerMethod) handler; + String method = request.getMethod() + " " + request.getRequestURI()+ JsonUtils.toJsonString(request.getParameterMap()); + String controllerName = handlerMethod.getBeanType().getSimpleName(); + String actionName = handlerMethod.getMethod().getName(); + + // 创建埋点消息 + BuriedMessages message = new BuriedMessages(); + message.setId(requestId); + message.setEventTime(System.currentTimeMillis()); + message.setService(SpringUtils.getApplicationName()); + message.setMethod(method); + message.setUserId(getUserId(request)); + message.setSessionId(request.getSession().getId()); + message.setClientIp(ServletUtils.getClientIP(request)); + message.setServerIp(getServerIp()); + message.setEventType("API_REQUEST_START"); + message.setPagePath(controllerName + "#" + actionName); + message.setUserAgent(request.getHeader("User-Agent")); + message.setStatusCode(BuriedMessages.STATUS_INIT); + buriedPointProducer.asyncSendMessage(message); + if (log.isDebugEnabled()) { + log.debug("[埋点] 收集请求开始数据: {}", message); + } + } catch (Exception e) { + log.warn("[埋点] 埋点数据收集异常", e); + } + + return true; + } + + /** + * 获取当前登录用户ID + * 如果未登录返回匿名标识 + */ + private String getUserId(HttpServletRequest request) { + Object userAttribute = request.getSession().getAttribute("USER_ID"); + if (userAttribute != null) { + return userAttribute.toString(); + } + // 返回匿名用户标识 + return "anonymous"; + } + + /** + * 获取服务器IP + */ + private String getServerIp() { + try { + return InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + throw new RuntimeException(e); + } + } +} \ No newline at end of file diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/mapper/BuriedPointMapper.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/mapper/BuriedPointMapper.java new file mode 100644 index 0000000..bd56003 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/mapper/BuriedPointMapper.java @@ -0,0 +1,10 @@ +package com.tashow.cloud.app.mq.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.tashow.cloud.app.mq.model.BuriedPoint; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +public interface BuriedPointMapper extends BaseMapper { +} \ No newline at end of file diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/message/BuriedMessages.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/message/BuriedMessages.java new file mode 100644 index 0000000..243fae9 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/message/BuriedMessages.java @@ -0,0 +1,71 @@ +package com.tashow.cloud.app.mq.message; +import lombok.Data; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +@Data +public class BuriedMessages implements Serializable { + + // 消息队列配置 + public static final String QUEUE = "BURIED_POINT_QUEUE"; + public static final String EXCHANGE = "BURIED_POINT_EXCHANGE"; + public static final String ROUTING_KEY = "BURIED_POINT_ROUTING_KEY"; + public static final String DEAD_LETTER_EXCHANGE = "DEAD_LETTER_EXCHANGE"; + public static final String DEAD_LETTER_ROUTING_KEY = "DEAD_LETTER_ROUTING"; + public static final String DEAD_LETTER_QUEUE = "DEAD_LETTER_QUEUE"; + + // 状态码定义 + public static final Integer STATUS_INIT = 10; // 初始状态 + public static final Integer STATUS_PROCESSING = 20; // 处理中 + public static final Integer STATUS_SUCCESS = 30; // 处理成功 + public static final Integer STATUS_WARNING = 40; // 处理警告 + public static final Integer STATUS_ERROR = 50; // 处理错误 + + // 通用字段 + private Integer id; // 事件唯一ID + private Long eventTime; // 事件时间戳 + private String service; // 服务名称 + private String method; // 方法/接口 + private String userId; // 用户标识 + private String sessionId; // 会话标识 + private String clientIp; // 客户端IP + private String serverIp; // 服务器IP + + // 添加埋点特定字段 + private String eventType; // 事件类型: PAGE_VIEW, API_CALL, BUTTON_CLICK 等 + private String pagePath; // 页面路径/功能模块 + private String elementId; // 元素标识 + private Long duration; // 操作时长(毫秒) + private String deviceInfo; // 设备信息 + private String userAgent; // 用户代理信息 + private Integer statusCode; // 响应状态码 + private String errorMessage; // 错误信息 + + // 扩展字段，用于存储特定事件的额外数据 + private Map extraData = new HashMap<>(); + + /** + * 快速创建消息的便捷方法 + */ + public static BuriedMessages create(String userId, String eventType, String pagePath) { + BuriedMessages msg = new BuriedMessages(); + msg.setUserId(userId); + msg.setEventType(eventType); + msg.setPagePath(pagePath); + msg.setEventTime(System.currentTimeMillis()); + msg.setStatusCode(STATUS_INIT); // 默认初始状态 + return msg; + } + + /** + * 添加扩展数据 + */ + public BuriedMessages addExtraData(String key, Object value) { + if (this.extraData == null) { + this.extraData = new HashMap<>(); + } + this.extraData.put(key, value); + return this; + } +} diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/model/BuriedPoint.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/model/BuriedPoint.java new file mode 100644 index 0000000..d6e91ca --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/model/BuriedPoint.java @@ -0,0 +1,109 @@ +package com.tashow.cloud.app.mq.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * 埋点数据实体类 + */ +@Data +@Accessors(chain = true) +@TableName(value = "app_burying") +public class BuriedPoint { + /** + * 主键ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 事件唯一ID + */ + @TableField(value = "event_id") + private Integer eventId; + + /** + * 事件时间戳 + */ + @TableField(value = "event_time") + private Long eventTime; + + /** + * 服务名称 + */ + @TableField(value = "service") + private String service; + + /** + * 方法/接口 + */ + @TableField(value = "method") + private String method; + + /** + * 用户标识 + */ + @TableField(value = "user_id") + private String userId; + + /** + * 会话标识 + */ + @TableField(value = "session_id") + private String sessionId; + + /** + * 客户端IP + */ + @TableField(value = "client_ip") + private String clientIp; + + /** + * 服务器IP + */ + @TableField(value = "server_ip") + private String serverIp; + + /** + * 事件类型 + */ + @TableField(value = "event_type") + private String eventType; + + /** + * 页面路径/功能模块 + */ + @TableField(value = "page_path") + private String pagePath; + + /** + * 元素标识 + */ + @TableField(value = "element_id") + private String elementId; + + /** + * 操作时长(毫秒) + */ + @TableField(value = "duration") + private Long duration; + + /** + * 创建时间 + */ + @TableField(value = "create_time") + private Date createTime; + + + @TableField(value = "update_time") + private Date updateTime; + + @TableField(value = "status") + private Integer status; +} \ No newline at end of file diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/producer/buriedPoint/BuriedPointProducer.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/producer/buriedPoint/BuriedPointProducer.java new file mode 100644 index 0000000..7130e70 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/mq/producer/buriedPoint/BuriedPointProducer.java @@ -0,0 +1,49 @@ +package com.tashow.cloud.app.mq.producer.buriedPoint; +import com.tashow.cloud.app.mq.message.BuriedMessages; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.connection.CorrelationData; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.UUID; + +/** + * 埋点消息生产者 + */ +@Slf4j +@Component +public class BuriedPointProducer { + + @Autowired + private RabbitTemplate rabbitTemplate; + + /** + * 异步发送完整的埋点消息，并确保消息已被broker接收 + */ + @SneakyThrows + public void asyncSendMessage(BuriedMessages message) { + CorrelationData correlationData = new CorrelationData(UUID.randomUUID().toString()); + // final CompletableFuture confirmFuture = new CompletableFuture<>(); + log.info("[埋点] 异步准备发送消息: {}", message); + correlationData.getFuture().whenComplete((confirm, ex) -> { + log.info("[埋点] 异步消息发送确认回调: {}", message); + if (ex != null) { + log.error("[埋点] 异步消息发送异常: {}", ex.getMessage(), ex); + // confirmFuture.completeExceptionally(ex); + } else if (confirm != null && confirm.isAck()) { + log.info("[埋点] 异步消息发送成功: {}", message); + // confirmFuture.complete(true); + } else { + log.warn("[埋点] 异步消息发送未被ACK"); +//confirmFuture.complete(false); + } + }); + rabbitTemplate.convertAndSend(BuriedMessages.EXCHANGE, BuriedMessages.ROUTING_KEY, message, correlationData); + log.info("[埋点] 异步消息发送完成: {}", message); + // return null; + } +} \ No newline at end of file diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/security/config/SecurityConfiguration.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/security/config/SecurityConfiguration.java new file mode 100644 index 0000000..693e32b --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/security/config/SecurityConfiguration.java @@ -0,0 +1,50 @@ +package com.tashow.cloud.app.security.config; + +import com.tashow.cloud.infraapi.enums.ApiConstants; +import com.tashow.cloud.security.security.config.AuthorizeRequestsCustomizer; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer; + +/** + * Infra 模块的 Security 配置 + */ +@Configuration(proxyBeanMethods = false, value = "infraSecurityConfiguration") +public class SecurityConfiguration { + + @Value("${spring.boot.admin.context-path:''}") + private String adminSeverContextPath; + + @Bean("infraAuthorizeRequestsCustomizer") + public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() { + return new AuthorizeRequestsCustomizer() { + + @Override + public void customize(AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry registry) { + // Swagger 接口文档 + registry.requestMatchers("/v3/api-docs/**").permitAll() + .requestMatchers("/webjars/**").permitAll() + .requestMatchers("/swagger-ui").permitAll() + .requestMatchers("/swagger-ui/**").permitAll(); + // Spring Boot Actuator 的安全配置 + registry.requestMatchers("/actuator").permitAll() + .requestMatchers("/actuator/**").permitAll(); + // Druid 监控 + registry.requestMatchers("/druid/**").permitAll(); + // Spring Boot Admin Server 的安全配置 + registry.requestMatchers(adminSeverContextPath).permitAll() + .requestMatchers(adminSeverContextPath + "/**").permitAll(); + // 文件读取 + registry.requestMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll(); + + // TODO 芋艿：这个每个项目都需要重复配置，得捉摸有没通用的方案 + // RPC 服务的安全配置 + registry.requestMatchers(ApiConstants.PREFIX + "/**").permitAll(); + } + + }; + } + +} diff --git a/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/security/core/package-info.java b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/security/core/package-info.java new file mode 100644 index 0000000..93a4969 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/java/com/tashow/cloud/app/security/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package com.tashow.cloud.app.security.core; diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/application-local.yaml b/tashow-module/tashow-module-app/src/main/resources/application-local.yaml similarity index 81% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/application-local.yaml rename to tashow-module/tashow-module-app/src/main/resources/application-local.yaml index 06fa7ed..a26f4bb 100644 --- a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/application-local.yaml +++ b/tashow-module/tashow-module-app/src/main/resources/application-local.yaml @@ -7,10 +7,10 @@ spring: username: nacos # Nacos 账号 password: nacos # Nacos 密码 discovery: # 【配置中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: liwq # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP metadata: version: 1.0.0 # 服务实例的版本号，可用于灰度发布 config: # 【注册中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: liwq # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP diff --git a/tashow-module/tashow-module-app/src/main/resources/application.yaml b/tashow-module/tashow-module-app/src/main/resources/application.yaml new file mode 100644 index 0000000..e9de0d5 --- /dev/null +++ b/tashow-module/tashow-module-app/src/main/resources/application.yaml @@ -0,0 +1,12 @@ +server: + port: 48083 +spring: + application: + name: app-server + profiles: + active: local + config: + import: + - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 + - optional:nacos:application.yaml # 加载【Nacos】的配置 + - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/Dockerfile b/tashow-module/tashow-module-infra/Dockerfile similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/Dockerfile rename to tashow-module/tashow-module-infra/Dockerfile diff --git a/tashow-module/tashow-module-infra/pom.xml b/tashow-module/tashow-module-infra/pom.xml index b882186..9d6c752 100644 --- a/tashow-module/tashow-module-infra/pom.xml +++ b/tashow-module/tashow-module-infra/pom.xml @@ -8,18 +8,157 @@ tashow-module ${revision} - - tashow-module-infra-api - tashow-module-infra-biz - tashow-module-infra - pom + jar ${project.artifactId} infra 模块，主要提供两块能力： - 1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等 - 2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等 + 1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等 + 2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等 + + + + com.tashow.cloud + tashow-framework-env + + + + + com.tashow.cloud + tashow-system-api + ${revision} + + + com.tashow.cloud + tashow-infra-api + ${revision} + + + + + com.tashow.cloud + tashow-framework-tenant + + + + + com.tashow.cloud + tashow-framework-security + + + + com.tashow.cloud + tashow-framework-websocket + + + + + com.tashow.cloud + tashow-data-mybatis + + + com.baomidou + mybatis-plus-generator + + + + com.tashow.cloud + tashow-data-redis + + + + + com.tashow.cloud + tashow-framework-rpc + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.tashow.cloud + tashow-framework-job + + + + + com.tashow.cloud + tashow-framework-mq + + + + + com.tashow.cloud + tashow-data-excel + + + + org.apache.velocity + velocity-engine-core + + + + + com.tashow.cloud + tashow-framework-monitor + + + + de.codecentric + spring-boot-admin-starter-server + + + + + commons-net + commons-net + + + com.jcraft + jsch + + + com.amazonaws + aws-java-sdk-s3 + + + + org.apache.tika + tika-core + + + + + + ${project.artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + + repackage + + + + + + + diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/InfraServerApplication.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/InfraServerApplication.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/InfraServerApplication.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/InfraServerApplication.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/config/ConfigApiImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/config/ConfigApiImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/config/ConfigApiImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/config/ConfigApiImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/file/FileApiImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/file/FileApiImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/file/FileApiImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/file/FileApiImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/logger/ApiAccessLogApiImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/logger/ApiAccessLogApiImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/logger/ApiAccessLogApiImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/logger/ApiAccessLogApiImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/logger/ApiErrorLogApiImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/logger/ApiErrorLogApiImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/logger/ApiErrorLogApiImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/logger/ApiErrorLogApiImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/websocket/WebSocketSenderApiImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/websocket/WebSocketSenderApiImpl.java similarity index 56% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/websocket/WebSocketSenderApiImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/websocket/WebSocketSenderApiImpl.java index 9833991..334748a 100644 --- a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/api/websocket/WebSocketSenderApiImpl.java +++ b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/api/websocket/WebSocketSenderApiImpl.java @@ -1,7 +1,6 @@ package com.tashow.cloud.infra.api.websocket; -import cn.hutool.core.util.StrUtil; import com.tashow.cloud.common.pojo.CommonResult; import com.tashow.cloud.infraapi.api.websocket.WebSocketSenderApi; import com.tashow.cloud.infraapi.api.websocket.dto.WebSocketSendReqDTO; @@ -15,22 +14,22 @@ import static com.tashow.cloud.common.pojo.CommonResult.success; @RestController // 提供 RESTful API 接口，给 Feign 调用 @Validated public class WebSocketSenderApiImpl implements WebSocketSenderApi { - +// @Resource private WebSocketMessageSender webSocketMessageSender; @Override public CommonResult send(WebSocketSendReqDTO message) { - if (StrUtil.isNotEmpty(message.getSessionId())) { - webSocketMessageSender.send(message.getSessionId(), - message.getMessageType(), message.getMessageContent()); - } else if (message.getUserType() != null && message.getUserId() != null) { - webSocketMessageSender.send(message.getUserType(), message.getUserId(), - message.getMessageType(), message.getMessageContent()); - } else if (message.getUserType() != null) { - webSocketMessageSender.send(message.getUserType(), - message.getMessageType(), message.getMessageContent()); - } +// if (StrUtil.isNotEmpty(message.getSessionId())) { +// webSocketMessageSender.send(message.getSessionId(), +// message.getMessageType(), message.getMessageContent()); +// } else if (message.getUserType() != null && message.getUserId() != null) { +// webSocketMessageSender.send(message.getUserType(), message.getUserId(), +// message.getMessageType(), message.getMessageContent()); +// } else if (message.getUserType() != null) { +// webSocketMessageSender.send(message.getUserType(), +// message.getMessageType(), message.getMessageContent()); +// } return success(true); } diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/CodegenController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/CodegenController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/CodegenController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/CodegenController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/config/ConfigController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/config/ConfigController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/config/ConfigController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/config/ConfigController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigPageReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigPageReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigPageReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigSaveReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigSaveReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/config/vo/ConfigSaveReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/db/DataSourceConfigController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/db/DataSourceConfigController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/db/DataSourceConfigController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/db/DataSourceConfigController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/db/vo/DataSourceConfigRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/db/vo/DataSourceConfigRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/db/vo/DataSourceConfigRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/db/vo/DataSourceConfigRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/db/vo/DataSourceConfigSaveReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/Demo01ContactController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/Demo01ContactController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/Demo01ContactController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/Demo01ContactController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo01/vo/Demo01ContactSaveReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/Demo02CategoryController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/Demo02CategoryController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/Demo02CategoryController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/Demo02CategoryController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/Demo03StudentController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/Demo03StudentController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/Demo03StudentController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/Demo03StudentController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentPageReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentPageReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentPageReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentSaveReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentSaveReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/demo03/vo/Demo03StudentSaveReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/demo/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/demo/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileConfigController.http b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileConfigController.http similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileConfigController.http rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileConfigController.http diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileConfigController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileConfigController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileConfigController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileConfigController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/FileController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/config/FileConfigSaveReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileCreateReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileCreateReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileCreateReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileCreateReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FilePageReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FilePageReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FilePageReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FilePageReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FilePresignedUrlRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileUploadReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileUploadReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileUploadReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/file/vo/file/FileUploadReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/job/JobController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/job/JobController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/job/JobController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/job/JobController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/ApiAccessLogController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/ApiAccessLogController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/ApiAccessLogController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/ApiAccessLogController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/ApiErrorLogController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/ApiErrorLogController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/ApiErrorLogController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/ApiErrorLogController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/redis/RedisController.http b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/redis/RedisController.http similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/redis/RedisController.http rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/redis/RedisController.http diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/redis/RedisController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/redis/RedisController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/redis/RedisController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/redis/RedisController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/redis/vo/RedisMonitorRespVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/redis/vo/RedisMonitorRespVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/admin/redis/vo/RedisMonitorRespVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/admin/redis/vo/RedisMonitorRespVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/app/file/AppFileController.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/app/file/AppFileController.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/app/file/AppFileController.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/app/file/AppFileController.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/app/file/vo/AppFileUploadReqVO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/app/file/vo/AppFileUploadReqVO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/app/file/vo/AppFileUploadReqVO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/app/file/vo/AppFileUploadReqVO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/app/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/app/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/app/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/app/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/controller/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/controller/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/codegen/CodegenConvert.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/codegen/CodegenConvert.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/codegen/CodegenConvert.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/codegen/CodegenConvert.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/config/ConfigConvert.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/config/ConfigConvert.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/config/ConfigConvert.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/config/ConfigConvert.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/file/FileConfigConvert.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/file/FileConfigConvert.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/file/FileConfigConvert.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/file/FileConfigConvert.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/redis/RedisConvert.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/redis/RedisConvert.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/redis/RedisConvert.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/redis/RedisConvert.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/codegen/CodegenColumnDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/codegen/CodegenColumnDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/codegen/CodegenColumnDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/codegen/CodegenColumnDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/codegen/CodegenTableDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/codegen/CodegenTableDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/codegen/CodegenTableDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/codegen/CodegenTableDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/config/ConfigDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/config/ConfigDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/config/ConfigDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/config/ConfigDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/db/DataSourceConfigDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/db/DataSourceConfigDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/db/DataSourceConfigDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/db/DataSourceConfigDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo01/Demo01ContactDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo01/Demo01ContactDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo01/Demo01ContactDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo01/Demo01ContactDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo02/Demo02CategoryDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo02/Demo02CategoryDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo02/Demo02CategoryDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo02/Demo02CategoryDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03CourseDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03CourseDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03CourseDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03CourseDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03GradeDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03GradeDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03GradeDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03GradeDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03StudentDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03StudentDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03StudentDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/demo/demo03/Demo03StudentDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileConfigDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileConfigDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileConfigDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileConfigDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileContentDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileContentDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileContentDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileContentDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/file/FileDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/logger/ApiAccessLogDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/logger/ApiAccessLogDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/logger/ApiAccessLogDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/logger/ApiAccessLogDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/logger/ApiErrorLogDO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/logger/ApiErrorLogDO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/dataobject/logger/ApiErrorLogDO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/dataobject/logger/ApiErrorLogDO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/codegen/CodegenColumnMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/codegen/CodegenColumnMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/codegen/CodegenColumnMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/codegen/CodegenColumnMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/codegen/CodegenTableMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/codegen/CodegenTableMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/codegen/CodegenTableMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/codegen/CodegenTableMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/config/ConfigMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/config/ConfigMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/config/ConfigMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/config/ConfigMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/db/DataSourceConfigMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/db/DataSourceConfigMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/db/DataSourceConfigMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/db/DataSourceConfigMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo01/Demo01ContactMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo01/Demo01ContactMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo01/Demo01ContactMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo01/Demo01ContactMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo02/Demo02CategoryMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo02/Demo02CategoryMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo02/Demo02CategoryMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo02/Demo02CategoryMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03CourseMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03CourseMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03CourseMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03CourseMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03GradeMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03GradeMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03GradeMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03GradeMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03StudentMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03StudentMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03StudentMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/demo/demo03/Demo03StudentMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileConfigMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileConfigMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileConfigMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileConfigMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileContentMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileContentMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileContentMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileContentMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/file/FileMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/logger/ApiAccessLogMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/logger/ApiAccessLogMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/logger/ApiAccessLogMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/logger/ApiAccessLogMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/logger/ApiErrorLogMapper.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/logger/ApiErrorLogMapper.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/dal/mysql/logger/ApiErrorLogMapper.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/dal/mysql/logger/ApiErrorLogMapper.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenColumnListConditionEnum.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenColumnListConditionEnum.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenColumnListConditionEnum.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenColumnListConditionEnum.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenFrontTypeEnum.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenFrontTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenFrontTypeEnum.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenFrontTypeEnum.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenSceneEnum.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenSceneEnum.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenSceneEnum.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenSceneEnum.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenTemplateTypeEnum.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenTemplateTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenTemplateTypeEnum.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/codegen/CodegenTemplateTypeEnum.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/config/ConfigTypeEnum.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/config/ConfigTypeEnum.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/config/ConfigTypeEnum.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/config/ConfigTypeEnum.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/logger/ApiErrorLogProcessStatusEnum.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/logger/ApiErrorLogProcessStatusEnum.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/logger/ApiErrorLogProcessStatusEnum.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/logger/ApiErrorLogProcessStatusEnum.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/enums/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/enums/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/codegen/config/CodegenConfiguration.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/codegen/config/CodegenConfiguration.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/codegen/config/CodegenConfiguration.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/codegen/config/CodegenConfiguration.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/codegen/config/CodegenProperties.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/codegen/config/CodegenProperties.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/codegen/config/CodegenProperties.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/codegen/config/CodegenProperties.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/codegen/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/codegen/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/codegen/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/codegen/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/config/YudaoFileAutoConfiguration.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/config/YudaoFileAutoConfiguration.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/config/YudaoFileAutoConfiguration.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/config/YudaoFileAutoConfiguration.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/AbstractFileClient.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/AbstractFileClient.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/AbstractFileClient.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/AbstractFileClient.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClient.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClient.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClient.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClient.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientConfig.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientConfig.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientConfig.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientConfig.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientFactory.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientFactory.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientFactory.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientFactory.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientFactoryImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientFactoryImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientFactoryImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/FileClientFactoryImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/db/DBFileClient.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/db/DBFileClient.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/db/DBFileClient.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/db/DBFileClient.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/db/DBFileClientConfig.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/db/DBFileClientConfig.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/db/DBFileClientConfig.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/db/DBFileClientConfig.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/ftp/FtpFileClient.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/ftp/FtpFileClient.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/ftp/FtpFileClient.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/ftp/FtpFileClient.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/ftp/FtpFileClientConfig.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/ftp/FtpFileClientConfig.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/ftp/FtpFileClientConfig.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/ftp/FtpFileClientConfig.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/local/LocalFileClient.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/local/LocalFileClient.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/local/LocalFileClient.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/local/LocalFileClient.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/local/LocalFileClientConfig.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/local/LocalFileClientConfig.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/local/LocalFileClientConfig.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/local/LocalFileClientConfig.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/FilePresignedUrlRespDTO.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/FilePresignedUrlRespDTO.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/FilePresignedUrlRespDTO.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/FilePresignedUrlRespDTO.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/S3FileClient.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/S3FileClient.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/S3FileClient.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/S3FileClient.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/S3FileClientConfig.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/S3FileClientConfig.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/S3FileClientConfig.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/s3/S3FileClientConfig.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/sftp/SftpFileClient.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/sftp/SftpFileClient.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/sftp/SftpFileClient.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/sftp/SftpFileClient.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/sftp/SftpFileClientConfig.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/sftp/SftpFileClientConfig.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/client/sftp/SftpFileClientConfig.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/client/sftp/SftpFileClientConfig.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/enums/FileStorageEnum.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/enums/FileStorageEnum.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/enums/FileStorageEnum.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/enums/FileStorageEnum.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/utils/FileTypeUtils.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/utils/FileTypeUtils.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/core/utils/FileTypeUtils.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/core/utils/FileTypeUtils.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/file/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/file/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/monitor/config/AdminServerConfiguration.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/monitor/config/AdminServerConfiguration.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/monitor/config/AdminServerConfiguration.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/monitor/config/AdminServerConfiguration.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/monitor/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/monitor/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/monitor/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/monitor/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/rpc/config/RpcConfiguration.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/rpc/config/RpcConfiguration.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/rpc/config/RpcConfiguration.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/rpc/config/RpcConfiguration.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/rpc/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/rpc/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/rpc/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/rpc/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/security/config/SecurityConfiguration.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/security/config/SecurityConfiguration.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/security/config/SecurityConfiguration.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/security/config/SecurityConfiguration.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/security/core/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/security/core/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/framework/security/core/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/framework/security/core/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/job/logger/AccessLogCleanJob.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/job/logger/AccessLogCleanJob.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/job/logger/AccessLogCleanJob.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/job/logger/AccessLogCleanJob.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/job/logger/ErrorLogCleanJob.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/job/logger/ErrorLogCleanJob.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/job/logger/ErrorLogCleanJob.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/job/logger/ErrorLogCleanJob.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/job/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/job/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/job/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/job/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/mq/consumer/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/mq/consumer/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/mq/consumer/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/mq/consumer/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/mq/message/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/mq/message/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/mq/message/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/mq/message/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/mq/producer/package-info.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/mq/producer/package-info.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/mq/producer/package-info.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/mq/producer/package-info.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/codegen/CodegenService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/codegen/CodegenService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/codegen/CodegenService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/codegen/CodegenService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/codegen/CodegenServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/codegen/CodegenServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/codegen/CodegenServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/codegen/CodegenServiceImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/codegen/inner/CodegenBuilder.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/codegen/inner/CodegenBuilder.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/codegen/inner/CodegenBuilder.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/codegen/inner/CodegenBuilder.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/codegen/inner/CodegenEngine.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/codegen/inner/CodegenEngine.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/codegen/inner/CodegenEngine.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/codegen/inner/CodegenEngine.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/config/ConfigService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/config/ConfigService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/config/ConfigService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/config/ConfigService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/config/ConfigServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/config/ConfigServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/config/ConfigServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/config/ConfigServiceImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/db/DataSourceConfigService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/db/DataSourceConfigService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/db/DataSourceConfigService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/db/DataSourceConfigService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/db/DataSourceConfigServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/db/DataSourceConfigServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/db/DataSourceConfigServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/db/DataSourceConfigServiceImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/db/DatabaseTableService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/db/DatabaseTableService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/db/DatabaseTableService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/db/DatabaseTableService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/db/DatabaseTableServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/db/DatabaseTableServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/db/DatabaseTableServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/db/DatabaseTableServiceImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo01/Demo01ContactService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo01/Demo01ContactService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo01/Demo01ContactService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo01/Demo01ContactService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo01/Demo01ContactServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo01/Demo01ContactServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo01/Demo01ContactServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo01/Demo01ContactServiceImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo02/Demo02CategoryService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo02/Demo02CategoryService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo02/Demo02CategoryService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo02/Demo02CategoryService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo02/Demo02CategoryServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo02/Demo02CategoryServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo02/Demo02CategoryServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo02/Demo02CategoryServiceImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo03/Demo03StudentService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo03/Demo03StudentService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo03/Demo03StudentService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo03/Demo03StudentService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo03/Demo03StudentServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo03/Demo03StudentServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/demo/demo03/Demo03StudentServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/demo/demo03/Demo03StudentServiceImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/file/FileConfigService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/file/FileConfigService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/file/FileConfigService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/file/FileConfigService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/file/FileConfigServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/file/FileConfigServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/file/FileConfigServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/file/FileConfigServiceImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/file/FileService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/file/FileService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/file/FileService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/file/FileService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/file/FileServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/file/FileServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/file/FileServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/file/FileServiceImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/logger/ApiAccessLogService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/logger/ApiAccessLogService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/logger/ApiAccessLogService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/logger/ApiAccessLogService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/logger/ApiAccessLogServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/logger/ApiAccessLogServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/logger/ApiAccessLogServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/logger/ApiAccessLogServiceImpl.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/logger/ApiErrorLogService.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/logger/ApiErrorLogService.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/logger/ApiErrorLogService.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/logger/ApiErrorLogService.java diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/logger/ApiErrorLogServiceImpl.java b/tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/logger/ApiErrorLogServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/service/logger/ApiErrorLogServiceImpl.java rename to tashow-module/tashow-module-infra/src/main/java/com/tashow/cloud/infra/service/logger/ApiErrorLogServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application-local.yaml b/tashow-module/tashow-module-infra/src/main/resources/application-local.yaml similarity index 81% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application-local.yaml rename to tashow-module/tashow-module-infra/src/main/resources/application-local.yaml index a781954..a26f4bb 100644 --- a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application-local.yaml +++ b/tashow-module/tashow-module-infra/src/main/resources/application-local.yaml @@ -7,11 +7,10 @@ spring: username: nacos # Nacos 账号 password: nacos # Nacos 密码 discovery: # 【配置中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: liwq # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP metadata: version: 1.0.0 # 服务实例的版本号，可用于灰度发布 config: # 【注册中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: liwq # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP - diff --git a/tashow-module/tashow-module-infra/src/main/resources/application.yaml b/tashow-module/tashow-module-infra/src/main/resources/application.yaml new file mode 100644 index 0000000..e4e14f6 --- /dev/null +++ b/tashow-module/tashow-module-infra/src/main/resources/application.yaml @@ -0,0 +1,13 @@ +server: + port: 48082 +spring: + application: + name: infra-server + profiles: + active: local + config: + import: + - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 + - optional:nacos:application.yaml # 加载【Nacos】的配置 + - optional:nacos:tenant.yaml # 加载【Nacos】的配置 + - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/controller.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/controller.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/controller/vo/listReqVO.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/listReqVO.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/controller/vo/listReqVO.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/listReqVO.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/pageReqVO.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/pageReqVO.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/respVO.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/respVO.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/saveReqVO.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/controller/vo/saveReqVO.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/saveReqVO.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/dal/do.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/dal/do.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/dal/do.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/dal/do.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/dal/do_sub.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/dal/do_sub.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/dal/do_sub.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/dal/do_sub.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/dal/mapper.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/dal/mapper.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/dal/mapper.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/dal/mapper.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/dal/mapper.xml.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/dal/mapper.xml.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/dal/mapper.xml.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/dal/mapper.xml.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/dal/mapper_sub.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/dal/mapper_sub.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/dal/mapper_sub.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/dal/mapper_sub.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/enums/errorcode.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/enums/errorcode.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/enums/errorcode.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/enums/errorcode.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/service/service.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/service/service.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/service/service.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/service/service.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/java/test/serviceTest.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/java/test/serviceTest.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/sql/h2.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/sql/h2.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/sql/h2.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/sql/h2.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/sql/sql.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/sql/sql.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/sql/sql.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/sql/sql.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue/api/api.js.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue/api/api.js.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/components/form_sub_erp.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/components/form_sub_inner.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/components/form_sub_normal.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/components/list_sub_erp.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/components/list_sub_inner.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/form.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/form.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/form.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/index.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue/views/index.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/api/api.ts.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/api/api.ts.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/form.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/form.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/index.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3/views/index.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3_vben/api/api.ts.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3_vben/api/api.ts.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3_vben/views/data.ts.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3_vben/views/data.ts.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3_vben/views/form.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3_vben/views/form.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/vue3_vben/views/index.vue.vm similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm rename to tashow-module/tashow-module-infra/src/main/resources/codegen/vue3_vben/views/index.vue.vm diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/file/erweima.jpg b/tashow-module/tashow-module-infra/src/main/resources/file/erweima.jpg similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/file/erweima.jpg rename to tashow-module/tashow-module-infra/src/main/resources/file/erweima.jpg diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/logback-spring.xml b/tashow-module/tashow-module-infra/src/main/resources/logback-spring.xml similarity index 100% rename from tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/logback-spring.xml rename to tashow-module/tashow-module-infra/src/main/resources/logback-spring.xml diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/pom.xml b/tashow-module/tashow-module-infra/tashow-module-infra-biz/pom.xml deleted file mode 100644 index eafc02f..0000000 --- a/tashow-module/tashow-module-infra/tashow-module-infra-biz/pom.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - 4.0.0 - - com.tashow.cloud - tashow-module-infra - ${revision} - - tashow-module-infra-biz - jar - - ${project.artifactId} - - infra 模块，主要提供两块能力： - 1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等 - 2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等 - - - - - - com.tashow.cloud - tashow-framework-env - - - - - com.tashow.cloud - tashow-module-system-api - ${revision} - - - com.tashow.cloud - tashow-module-infra-api - ${revision} - - - - - com.tashow.cloud - tashow-framework-tenant - - - - - com.tashow.cloud - tashow-framework-security - - - - com.tashow.cloud - tashow-framework-websocket - - - - - com.tashow.cloud - tashow-data-mybatis - - - com.baomidou - mybatis-plus-generator - - - - com.tashow.cloud - tashow-data-redis - - - - - com.tashow.cloud - tashow-framework-rpc - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.tashow.cloud - tashow-framework-job - - - - - com.tashow.cloud - tashow-framework-mq - - - - - com.tashow.cloud - tashow-data-excel - - - - org.apache.velocity - velocity-engine-core - - - - - com.tashow.cloud - tashow-framework-monitor - - - - de.codecentric - spring-boot-admin-starter-server - - - - - commons-net - commons-net - - - com.jcraft - jsch - - - com.amazonaws - aws-java-sdk-s3 - - - - org.apache.tika - tika-core - - - - - - ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - repackage - - - - - - - - diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/package-info.java b/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/package-info.java deleted file mode 100644 index a164141..0000000 --- a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/** - * infra 模块，主要提供两块能力： - * 1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等 - * 2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等 - * - * 1. Controller URL：以 /infra/ 开头，避免和其它 Module 冲突 - * 2. DataObject 表名：以 infra_ 开头，方便在数据库中区分 - */ -package com.tashow.cloud.infra; diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/websocket/DemoWebSocketMessageListener.java b/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/websocket/DemoWebSocketMessageListener.java deleted file mode 100644 index fafcfa4..0000000 --- a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/websocket/DemoWebSocketMessageListener.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.tashow.cloud.infra.websocket; - -import com.tashow.cloud.common.enums.UserTypeEnum; -import com.tashow.cloud.infra.websocket.message.DemoSendMessage; -import com.tashow.cloud.infra.websocket.message.DemoReceiveMessage; -import com.tashow.cloud.websocket.core.listener.WebSocketMessageListener; -import com.tashow.cloud.websocket.core.sender.WebSocketMessageSender; -import com.tashow.cloud.websocket.core.util.WebSocketFrameworkUtils; -import org.springframework.stereotype.Component; -import org.springframework.web.socket.WebSocketSession; - -import jakarta.annotation.Resource; - -/** - * WebSocket 示例：单发消息 - * - * @author 芋道源码 - */ -@Component -public class DemoWebSocketMessageListener implements WebSocketMessageListener { - - @Resource - private WebSocketMessageSender webSocketMessageSender; - - @Override - public void onMessage(WebSocketSession session, DemoSendMessage message) { - Long fromUserId = WebSocketFrameworkUtils.getLoginUserId(session); - // 情况一：单发 - if (message.getToUserId() != null) { - DemoReceiveMessage toMessage = new DemoReceiveMessage().setFromUserId(fromUserId) - .setText(message.getText()).setSingle(true); - webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), message.getToUserId(), // 给指定用户 - "demo-message-receive", toMessage); - return; - } - // 情况二：群发 - DemoReceiveMessage toMessage = new DemoReceiveMessage().setFromUserId(fromUserId) - .setText(message.getText()).setSingle(false); - webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), // 给所有用户 - "demo-message-receive", toMessage); - } - - @Override - public String getType() { - return "demo-message-send"; - } - -} diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/websocket/message/DemoReceiveMessage.java b/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/websocket/message/DemoReceiveMessage.java deleted file mode 100644 index f956ef9..0000000 --- a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/websocket/message/DemoReceiveMessage.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.tashow.cloud.infra.websocket.message; - -import lombok.Data; - -/** - * 示例：server -> client 同步消息 - * - * @author 芋道源码 - */ -@Data -public class DemoReceiveMessage { - - /** - * 接收人的编号 - */ - private Long fromUserId; - /** - * 内容 - */ - private String text; - - /** - * 是否单聊 - */ - private Boolean single; - -} diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/websocket/message/DemoSendMessage.java b/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/websocket/message/DemoSendMessage.java deleted file mode 100644 index 3ed3d98..0000000 --- a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/java/com/tashow/cloud/infra/websocket/message/DemoSendMessage.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.tashow.cloud.infra.websocket.message; - -import lombok.Data; - -/** - * 示例：client -> server 发送消息 - * - * @author 芋道源码 - */ -@Data -public class DemoSendMessage { - - /** - * 发送给谁 - * - * 如果为空，说明发送给所有人 - */ - private Long toUserId; - /** - * 内容 - */ - private String text; - -} diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/application.yaml b/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/application.yaml deleted file mode 100644 index d65481c..0000000 --- a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/application.yaml +++ /dev/null @@ -1,176 +0,0 @@ -spring: - application: - name: infra-server - profiles: - active: local - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Feign 等会存在重复定义的服务 - config: - import: - - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 - - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 - # Servlet 配置 - servlet: - # 文件上传相关配置项 - multipart: - max-file-size: 16MB # 单个文件大小 - max-request-size: 32MB # 设置总上传的文件大小 - # Jackson 配置项 - jackson: - serialization: - write-dates-as-timestamps: true # 设置 LocalDateTime 的格式，使用时间戳 - write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401，而是直接 1611460870401 - write-durations-as-timestamps: true # 设置 Duration 的格式，使用时间戳 - fail-on-empty-beans: false # 允许序列化无属性的 Bean - - # Cache 配置项 - cache: - type: REDIS - redis: - time-to-live: 1h # 设置过期时间为 1 小时 - -server: - port: 48082 - -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 - ---- #################### 接口文档配置 #################### - -springdoc: - api-docs: - enabled: true # 1. 是否开启 Swagger 接文档的元数据 - path: /v3/api-docs - swagger-ui: - enabled: true # 2.1 是否开启 Swagger 文档的官方 UI 界面 - path: /swagger-ui - default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档 - -knife4j: - enable: true # 2.2 是否开启 Swagger 文档的 Knife4j UI 界面 - setting: - language: zh_cn - -# MyBatis Plus 的配置项 -mybatis-plus: - configuration: - map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 - global-config: - db-config: - id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。 - # id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库 - # id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库 - # id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解 - logic-delete-value: 1 # 逻辑已删除值(默认为 1) - logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) - banner: false # 关闭控制台的 Banner 打印 - type-aliases-package: ${tashow.info.base-package}.dal.dataobject - encryptor: - password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成 - -mybatis-plus-join: - banner: false # 关闭控制台的 Banner 打印 - -# Spring Data Redis 配置 -spring: - data: - redis: - repositories: - enabled: false # 项目未使用到 Spring Data Redis 的 Repository，所以直接禁用，保证启动速度 - -# VO 转换（数据翻译）相关 -easy-trans: - is-enable-global: true # 启用全局翻译（拦截所有 SpringMVC ResponseBody 进行自动翻译 )。如果对于性能要求很高可关闭此配置，或通过 @IgnoreTrans 忽略某个接口 - ---- #################### RPC 远程调用相关配置 #################### - ---- #################### 消息队列相关 #################### - -# rocketmq 配置项，对应 RocketMQProperties 配置类 -rocketmq: - # Producer 配置项 - producer: - group: ${spring.application.name}_PRODUCER # 生产者分组 - -spring: - # Kafka 配置项，对应 KafkaProperties 配置类 - kafka: - # Kafka Producer 配置项 - producer: - acks: 1 # 0-不应答。1-leader 应答。all-所有 leader 和 follower 应答。 - retries: 3 # 发送失败时，重试发送的次数 - value-serializer: org.springframework.kafka.support.serializer.JsonSerializer # 消息的 value 的序列化 - # Kafka Consumer 配置项 - consumer: - auto-offset-reset: earliest # 设置消费者分组最初的消费进度为 earliest 。可参考博客 https://blog.csdn.net/lishuangzhe7047/article/details/74530417 理解 - value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer - properties: - spring.json.trusted.packages: '*' - # Kafka Consumer Listener 监听器配置 - listener: - missing-topics-fatal: false # 消费监听接口监听的主题不存在时，默认会报错。所以通过设置为 false ，解决报错 - ---- #################### 定时任务相关配置 #################### - -xxl: - job: - executor: - appname: ${spring.application.name} # 执行器 AppName - logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 - accessToken: default_token # 执行器通讯TOKEN - ---- #################### 芋道相关配置 #################### - -tashow: - info: - version: 1.0.0 - base-package: com.tashow.cloud.infra - web: - admin-ui: - url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 - xss: - enable: false - exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 - - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求 - - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 - websocket: - enable: true # websocket的开关 - path: /infra/ws # 路径 - sender-type: local # 消息发送的类型，可选值为 local、redis、rocketmq、kafka、rabbitmq - sender-rocketmq: - topic: ${spring.application.name}-websocket # 消息发送的 RocketMQ Topic - consumer-group: ${spring.application.name}-websocket-consumer # 消息发送的 RocketMQ Consumer Group - sender-rabbitmq: - exchange: ${spring.application.name}-websocket-exchange # 消息发送的 RabbitMQ Exchange - queue: ${spring.application.name}-websocket-queue # 消息发送的 RabbitMQ Queue - sender-kafka: - topic: ${spring.application.name}-websocket # 消息发送的 Kafka Topic - consumer-group: ${spring.application.name}-websocket-consumer # 消息发送的 Kafka Consumer Group - swagger: - title: 管理后台 - description: 提供管理员管理的所有功能 - version: ${tashow.info.version} - codegen: - base-package: com.tashow.cloud - db-schemas: ${spring.datasource.dynamic.datasource.master.name} - front-type: 20 # 前端模版的类型，参见 CodegenFrontTypeEnum 枚举类 - unit-test-enable: false # 是否生成单元测试 - tenant: # 多租户相关配置项 - enable: true - ignore-urls: - - /admin-api/infra/file/*/get/** # 获取图片，和租户无关 - ignore-tables: - - infra_codegen_column - - infra_codegen_table - - infra_config - - infra_file_config - - infra_file - - infra_file_content - - infra_job - - infra_job_log - - infra_job_log - - infra_data_source_config - -debug: false diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/Dockerfile b/tashow-module/tashow-module-system/Dockerfile similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/Dockerfile rename to tashow-module/tashow-module-system/Dockerfile diff --git a/tashow-module/tashow-module-system/pom.xml b/tashow-module/tashow-module-system/pom.xml index 71191d9..65c03b2 100644 --- a/tashow-module/tashow-module-system/pom.xml +++ b/tashow-module/tashow-module-system/pom.xml @@ -8,12 +8,8 @@ ${revision} 4.0.0 - - tashow-module-system-api - tashow-module-system-biz - tashow-module-system - pom + jar ${project.artifactId} @@ -21,4 +17,165 @@ 例如说：用户、部门、权限、数据字典等等 + + + + com.tashow.cloud + tashow-framework-env + + + com.tashow.cloud + tashow-framework-mq + + + + com.tashow.cloud + tashow-system-api + ${revision} + + + com.tashow.cloud + tashow-infra-api + ${revision} + + + + + com.tashow.cloud + tashow-data-permission + + + com.tashow.cloud + tashow-framework-tenant + + + + + com.tashow.cloud + tashow-framework-security + + + + + com.tashow.cloud + tashow-data-mybatis + + + + com.tashow.cloud + tashow-data-redis + + + + + com.tashow.cloud + tashow-framework-rpc + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.tashow.cloud + tashow-framework-job + + + + + com.tashow.cloud + tashow-framework-mq + + + + + + + + + + + com.tashow.cloud + tashow-data-excel + + + + org.springframework.boot + spring-boot-starter-mail + + + + + com.tashow.cloud + tashow-framework-monitor + + + + + com.xingyuv + spring-boot-starter-justauth + + + + com.github.binarywang + wx-java-mp-spring-boot-starter + + + com.github.binarywang + wx-java-miniapp-spring-boot-starter + + + + com.xingyuv + spring-boot-starter-captcha-plus + + + + org.dromara.hutool + hutool-extra + + + junit + junit + + + org.springframework + spring-test + + + org.springframework.boot + spring-boot-test + + + + + + + ${project.artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + + repackage + + + + + + + diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/SystemServerApplication.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/SystemServerApplication.java similarity index 81% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/SystemServerApplication.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/SystemServerApplication.java index 3959eab..04a5497 100644 --- a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/SystemServerApplication.java +++ b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/SystemServerApplication.java @@ -2,12 +2,14 @@ package com.tashow.cloud.system; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableAsync; /** * 项目的启动类 * @author 芋道源码 */ @SpringBootApplication +@EnableAsync // 开启异步 public class SystemServerApplication { public static void main(String[] args) { diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/dept/DeptApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/dept/DeptApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/dept/DeptApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/dept/DeptApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/dept/PostApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/dept/PostApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/dept/PostApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/dept/PostApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/dict/DictDataApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/dict/DictDataApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/dict/DictDataApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/dict/DictDataApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/logger/LoginLogApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/logger/LoginLogApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/logger/LoginLogApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/logger/LoginLogApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/logger/OperateLogApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/logger/OperateLogApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/logger/OperateLogApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/logger/OperateLogApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/mail/MailSendApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/mail/MailSendApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/mail/MailSendApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/mail/MailSendApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/notify/NotifyMessageSendApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/notify/NotifyMessageSendApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/notify/NotifyMessageSendApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/notify/NotifyMessageSendApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/oauth2/OAuth2TokenApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/oauth2/OAuth2TokenApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/oauth2/OAuth2TokenApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/oauth2/OAuth2TokenApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/permission/PermissionApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/permission/PermissionApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/permission/PermissionApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/permission/PermissionApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/permission/RoleApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/permission/RoleApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/permission/RoleApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/permission/RoleApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/sms/SmsCodeApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/sms/SmsCodeApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/sms/SmsCodeApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/sms/SmsCodeApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/sms/SmsSendApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/sms/SmsSendApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/sms/SmsSendApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/sms/SmsSendApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/social/SocialClientApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/social/SocialClientApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/social/SocialClientApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/social/SocialClientApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/social/SocialUserApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/social/SocialUserApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/social/SocialUserApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/social/SocialUserApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/tenant/TenantApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/tenant/TenantApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/tenant/TenantApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/tenant/TenantApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/user/AdminUserApiImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/user/AdminUserApiImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/api/user/AdminUserApiImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/api/user/AdminUserApiImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/AuthController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/AuthController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/AuthController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/AuthController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/AuthController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/AuthController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/AuthController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/AuthController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthLoginReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthLoginReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthLoginReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthLoginReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthLoginRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthLoginRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthLoginRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthLoginRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthMenuRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthMenuRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthMenuRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthMenuRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthRegisterReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthRegisterReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthRegisterReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthRegisterReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthResetPasswordReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthResetPasswordReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthResetPasswordReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthResetPasswordReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSmsSendReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSmsSendReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSmsSendReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSmsSendReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/CaptchaVerificationReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/CaptchaVerificationReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/CaptchaVerificationReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/auth/vo/CaptchaVerificationReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/captcha/CaptchaController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/captcha/CaptchaController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/captcha/CaptchaController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/captcha/CaptchaController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/DeptController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/DeptController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/DeptController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/DeptController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/PostController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/PostController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/PostController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/PostController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptListReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptListReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptListReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptListReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dept/vo/post/PostSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictDataController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictDataController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictDataController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictDataController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictDataController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictDataController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictDataController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictDataController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictTypeController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictTypeController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictTypeController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/DictTypeController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypePageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypePageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypePageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypePageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/ip/AreaController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/ip/AreaController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/ip/AreaController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/ip/AreaController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/ip/AreaController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/ip/AreaController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/ip/AreaController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/ip/AreaController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/ip/vo/AreaNodeRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/ip/vo/AreaNodeRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/ip/vo/AreaNodeRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/ip/vo/AreaNodeRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/LoginLogController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/LoginLogController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/LoginLogController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/LoginLogController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/OperateLogController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/OperateLogController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/OperateLogController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/OperateLogController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/OperateLogController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/OperateLogController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/OperateLogController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/OperateLogController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailAccountController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailAccountController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailAccountController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailAccountController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailLogController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailLogController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailLogController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailLogController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailTemplateController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailTemplateController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailTemplateController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailTemplateController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailTemplateController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailTemplateController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailTemplateController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/MailTemplateController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/log/MailLogPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/log/MailLogPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/log/MailLogPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/log/MailLogPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/log/MailLogRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/log/MailLogRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/log/MailLogRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/log/MailLogRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notice/NoticeController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notice/NoticeController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notice/NoticeController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notice/NoticeController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticePageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticePageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticePageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticePageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticeRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticeRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticeRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticeRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticeSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticeSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticeSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notice/vo/NoticeSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/NotifyMessageController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/NotifyMessageController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/NotifyMessageController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/NotifyMessageController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/NotifyTemplateController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/NotifyTemplateController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/NotifyTemplateController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/NotifyTemplateController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2ClientController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2ClientController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2ClientController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2ClientController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2ClientController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2ClientController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2ClientController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2ClientController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2OpenController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2OpenController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2OpenController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2OpenController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2OpenController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2OpenController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2OpenController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2OpenController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2TokenController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2TokenController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2TokenController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2TokenController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2UserController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2UserController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2UserController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2UserController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2UserController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2UserController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2UserController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/OAuth2UserController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/client/OAuth2ClientSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/MenuController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/MenuController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/MenuController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/MenuController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/MenuController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/MenuController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/MenuController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/MenuController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/PermissionController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/PermissionController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/PermissionController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/PermissionController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/RoleController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/RoleController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/RoleController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/RoleController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/RoleController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/RoleController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/RoleController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/RoleController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuListReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuListReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuListReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuListReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuSaveVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuSaveVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuSaveVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuSaveVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RolePageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RolePageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RolePageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RolePageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsCallbackController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsCallbackController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsCallbackController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsCallbackController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsChannelController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsChannelController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsChannelController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsChannelController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsLogController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsLogController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsLogController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsLogController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsTemplateController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsTemplateController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsTemplateController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsTemplateController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsTemplateController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsTemplateController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsTemplateController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/SmsTemplateController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/log/SmsLogRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/log/SmsLogRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/log/SmsLogRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/log/SmsLogRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialClientController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialClientController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialClientController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialClientController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialClientController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialClientController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialClientController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialClientController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialUserController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialUserController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialUserController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/SocialUserController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserBindReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserUnbindReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserUnbindReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserUnbindReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/socail/vo/user/SocialUserUnbindReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantPackageController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantPackageController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantPackageController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/TenantPackageController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/tenant/vo/tenant/TenantSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/UserController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/UserController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/UserController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/UserController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/UserController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/UserController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/UserController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/UserController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/UserProfileController.http b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/UserProfileController.http similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/UserProfileController.http rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/UserProfileController.http diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/UserProfileController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/UserProfileController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/UserProfileController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/UserProfileController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserImportExcelVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserImportExcelVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserImportExcelVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserImportExcelVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserImportRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserImportRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserImportRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserImportRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserPageReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserPageReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserPageReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserPageReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserSaveReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserSaveReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserSaveReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserSaveReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserSimpleRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserSimpleRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserSimpleRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserSimpleRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/app/dict/AppDictDataController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/app/dict/AppDictDataController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/app/dict/AppDictDataController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/app/dict/AppDictDataController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/app/dict/vo/AppDictDataRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/app/dict/vo/AppDictDataRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/app/dict/vo/AppDictDataRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/app/dict/vo/AppDictDataRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/app/ip/AppAreaController.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/app/ip/AppAreaController.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/app/ip/AppAreaController.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/app/ip/AppAreaController.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/app/ip/vo/AppAreaNodeRespVO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/app/ip/vo/AppAreaNodeRespVO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/app/ip/vo/AppAreaNodeRespVO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/app/ip/vo/AppAreaNodeRespVO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/app/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/app/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/app/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/app/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/controller/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/controller/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/auth/AuthConvert.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/auth/AuthConvert.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/auth/AuthConvert.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/auth/AuthConvert.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/oauth2/OAuth2OpenConvert.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/oauth2/OAuth2OpenConvert.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/oauth2/OAuth2OpenConvert.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/oauth2/OAuth2OpenConvert.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/social/SocialUserConvert.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/social/SocialUserConvert.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/social/SocialUserConvert.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/social/SocialUserConvert.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/tenant/TenantConvert.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/tenant/TenantConvert.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/tenant/TenantConvert.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/tenant/TenantConvert.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/user/UserConvert.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/user/UserConvert.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/user/UserConvert.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/user/UserConvert.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/DeptDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/DeptDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/DeptDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/DeptDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/PostDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/PostDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/PostDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/PostDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/UserPostDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/UserPostDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/UserPostDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/dept/UserPostDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/dict/DictDataDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/dict/DictDataDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/dict/DictDataDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/dict/DictDataDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/dict/DictTypeDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/dict/DictTypeDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/dict/DictTypeDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/dict/DictTypeDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/logger/LoginLogDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/logger/LoginLogDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/logger/LoginLogDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/logger/LoginLogDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/logger/OperateLogDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/logger/OperateLogDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/logger/OperateLogDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/logger/OperateLogDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailAccountDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailAccountDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailAccountDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailAccountDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailLogDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailLogDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailLogDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailLogDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailTemplateDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailTemplateDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailTemplateDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/mail/MailTemplateDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/notice/NoticeDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/notice/NoticeDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/notice/NoticeDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/notice/NoticeDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/notify/NotifyMessageDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/notify/NotifyMessageDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/notify/NotifyMessageDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/notify/NotifyMessageDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/notify/NotifyTemplateDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/notify/NotifyTemplateDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/notify/NotifyTemplateDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/notify/NotifyTemplateDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2ApproveDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2ApproveDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2ApproveDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2ApproveDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2ClientDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2ClientDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2ClientDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2ClientDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2CodeDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2CodeDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2CodeDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2CodeDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/MenuDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/MenuDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/MenuDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/MenuDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/RoleDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/RoleDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/RoleDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/RoleDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/RoleMenuDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/RoleMenuDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/RoleMenuDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/RoleMenuDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/UserRoleDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/UserRoleDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/UserRoleDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/permission/UserRoleDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsChannelDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsChannelDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsChannelDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsChannelDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsCodeDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsCodeDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsCodeDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsCodeDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsLogDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsLogDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsLogDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsLogDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsTemplateDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsTemplateDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsTemplateDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/sms/SmsTemplateDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialClientDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialClientDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialClientDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialClientDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialUserBindDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialUserBindDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialUserBindDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialUserBindDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialUserDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialUserDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialUserDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/social/SocialUserDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/tenant/TenantDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/tenant/TenantDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/tenant/TenantDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/tenant/TenantDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/tenant/TenantPackageDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/tenant/TenantPackageDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/tenant/TenantPackageDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/tenant/TenantPackageDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/user/AdminUserDO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/user/AdminUserDO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/dataobject/user/AdminUserDO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/dataobject/user/AdminUserDO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/dept/DeptMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/dept/DeptMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/dept/DeptMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/dept/DeptMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/dept/PostMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/dept/PostMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/dept/PostMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/dept/PostMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/dept/UserPostMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/dept/UserPostMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/dept/UserPostMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/dept/UserPostMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/dict/DictDataMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/dict/DictDataMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/dict/DictDataMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/dict/DictDataMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/dict/DictTypeMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/dict/DictTypeMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/dict/DictTypeMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/dict/DictTypeMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/logger/LoginLogMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/logger/LoginLogMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/logger/LoginLogMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/logger/LoginLogMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/logger/OperateLogMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/logger/OperateLogMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/logger/OperateLogMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/logger/OperateLogMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailAccountMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailAccountMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailAccountMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailAccountMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailLogMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailLogMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailLogMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailLogMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailTemplateMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailTemplateMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailTemplateMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/mail/MailTemplateMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/notice/NoticeMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/notice/NoticeMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/notice/NoticeMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/notice/NoticeMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/notify/NotifyMessageMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/notify/NotifyMessageMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/notify/NotifyMessageMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/notify/NotifyMessageMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/notify/NotifyTemplateMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/notify/NotifyTemplateMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/notify/NotifyTemplateMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/notify/NotifyTemplateMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2ApproveMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2ApproveMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2ApproveMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2ApproveMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2ClientMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2ClientMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2ClientMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2ClientMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2CodeMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2CodeMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2CodeMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2CodeMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/permission/MenuMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/permission/MenuMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/permission/MenuMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/permission/MenuMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/permission/RoleMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/permission/RoleMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/permission/RoleMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/permission/RoleMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/permission/RoleMenuMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/permission/RoleMenuMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/permission/RoleMenuMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/permission/RoleMenuMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/permission/UserRoleMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/permission/UserRoleMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/permission/UserRoleMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/permission/UserRoleMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsChannelMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsChannelMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsChannelMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsChannelMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsCodeMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsCodeMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsCodeMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsCodeMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsLogMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsLogMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsLogMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsLogMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsTemplateMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsTemplateMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsTemplateMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/sms/SmsTemplateMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialClientMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialClientMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialClientMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialClientMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialUserBindMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialUserBindMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialUserBindMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialUserBindMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialUserMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialUserMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialUserMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/social/SocialUserMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/tenant/TenantMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/tenant/TenantMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/tenant/TenantMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/tenant/TenantMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/tenant/TenantPackageMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/tenant/TenantPackageMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/tenant/TenantPackageMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/tenant/TenantPackageMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/user/AdminUserMapper.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/user/AdminUserMapper.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/mysql/user/AdminUserMapper.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/mysql/user/AdminUserMapper.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/redis/RedisKeyConstants.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/redis/RedisKeyConstants.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/redis/RedisKeyConstants.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/redis/RedisKeyConstants.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/captcha/config/YudaoCaptchaConfiguration.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/captcha/config/YudaoCaptchaConfiguration.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/captcha/config/YudaoCaptchaConfiguration.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/captcha/config/YudaoCaptchaConfiguration.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/captcha/core/RedisCaptchaServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/captcha/core/RedisCaptchaServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/captcha/core/RedisCaptchaServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/captcha/core/RedisCaptchaServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/captcha/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/captcha/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/captcha/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/captcha/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/datapermission/config/DataPermissionConfiguration.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/datapermission/config/DataPermissionConfiguration.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/datapermission/config/DataPermissionConfiguration.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/datapermission/config/DataPermissionConfiguration.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/datapermission/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/datapermission/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/datapermission/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/datapermission/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/AdminUserParseFunction.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/AdminUserParseFunction.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/AdminUserParseFunction.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/AdminUserParseFunction.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/AreaParseFunction.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/AreaParseFunction.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/AreaParseFunction.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/AreaParseFunction.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/BooleanParseFunction.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/BooleanParseFunction.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/BooleanParseFunction.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/BooleanParseFunction.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/DeptParseFunction.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/DeptParseFunction.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/DeptParseFunction.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/DeptParseFunction.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/PostParseFunction.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/PostParseFunction.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/PostParseFunction.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/PostParseFunction.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/SexParseFunction.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/SexParseFunction.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/core/SexParseFunction.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/core/SexParseFunction.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/operatelog/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/operatelog/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/rpc/config/RpcConfiguration.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/rpc/config/RpcConfiguration.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/rpc/config/RpcConfiguration.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/rpc/config/RpcConfiguration.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/rpc/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/rpc/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/rpc/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/rpc/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/security/config/SecurityConfiguration.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/security/config/SecurityConfiguration.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/security/config/SecurityConfiguration.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/security/config/SecurityConfiguration.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/security/core/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/security/core/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/security/core/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/security/core/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/config/SmsCodeProperties.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/config/SmsCodeProperties.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/config/SmsCodeProperties.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/config/SmsCodeProperties.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/config/SmsConfiguration.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/config/SmsConfiguration.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/config/SmsConfiguration.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/config/SmsConfiguration.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/SmsClient.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/SmsClient.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/SmsClient.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/SmsClient.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/SmsClientFactory.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/SmsClientFactory.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/SmsClientFactory.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/SmsClientFactory.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsReceiveRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsSendRespDTO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsSendRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsSendRespDTO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsSendRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/dto/SmsTemplateRespDTO.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/AbstractSmsClient.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/AbstractSmsClient.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/AbstractSmsClient.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/AbstractSmsClient.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/AliyunSmsClient.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/AliyunSmsClient.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/AliyunSmsClient.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/AliyunSmsClient.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/DebugDingTalkSmsClient.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/DebugDingTalkSmsClient.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/DebugDingTalkSmsClient.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/DebugDingTalkSmsClient.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/HuaweiSmsClient.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/HuaweiSmsClient.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/HuaweiSmsClient.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/HuaweiSmsClient.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/QiniuSmsClient.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/QiniuSmsClient.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/QiniuSmsClient.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/QiniuSmsClient.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/TencentSmsClient.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/TencentSmsClient.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/TencentSmsClient.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/client/impl/TencentSmsClient.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/enums/SmsChannelEnum.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/enums/SmsChannelEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/enums/SmsChannelEnum.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/enums/SmsChannelEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/property/SmsChannelProperties.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/property/SmsChannelProperties.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/framework/sms/core/property/SmsChannelProperties.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/framework/sms/core/property/SmsChannelProperties.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/job/demo/DemoJob.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/job/demo/DemoJob.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/job/demo/DemoJob.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/job/demo/DemoJob.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/job/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/job/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/job/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/job/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/consumer/mail/MailSendConsumer.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/consumer/mail/MailSendConsumer.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/consumer/mail/MailSendConsumer.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/consumer/mail/MailSendConsumer.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/consumer/sms/SmsSendConsumer.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/consumer/sms/SmsSendConsumer.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/consumer/sms/SmsSendConsumer.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/consumer/sms/SmsSendConsumer.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/message/mail/MailSendMessage.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/message/mail/MailSendMessage.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/message/mail/MailSendMessage.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/message/mail/MailSendMessage.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/message/sms/SmsSendMessage.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/message/sms/SmsSendMessage.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/message/sms/SmsSendMessage.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/message/sms/SmsSendMessage.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/producer/mail/MailProducer.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/producer/mail/MailProducer.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/producer/mail/MailProducer.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/producer/mail/MailProducer.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/producer/sms/SmsProducer.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/producer/sms/SmsProducer.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/mq/producer/sms/SmsProducer.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/mq/producer/sms/SmsProducer.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/auth/AdminAuthService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/auth/AdminAuthService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/auth/AdminAuthService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/auth/AdminAuthService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/auth/AdminAuthServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/auth/AdminAuthServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/auth/AdminAuthServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/auth/AdminAuthServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dept/DeptService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dept/DeptService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dept/DeptService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dept/DeptService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dept/DeptServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dept/DeptServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dept/DeptServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dept/DeptServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dept/PostService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dept/PostService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dept/PostService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dept/PostService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dept/PostServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dept/PostServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dept/PostServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dept/PostServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dict/DictDataService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dict/DictDataService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dict/DictDataService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dict/DictDataService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dict/DictDataServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dict/DictDataServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dict/DictDataServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dict/DictDataServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dict/DictTypeService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dict/DictTypeService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dict/DictTypeService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dict/DictTypeService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dict/DictTypeServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dict/DictTypeServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/dict/DictTypeServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/dict/DictTypeServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/logger/LoginLogService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/logger/LoginLogService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/logger/LoginLogService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/logger/LoginLogService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/logger/LoginLogServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/logger/LoginLogServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/logger/LoginLogServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/logger/LoginLogServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/logger/OperateLogService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/logger/OperateLogService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/logger/OperateLogService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/logger/OperateLogService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/logger/OperateLogServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/logger/OperateLogServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/logger/OperateLogServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/logger/OperateLogServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailAccountService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailAccountService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailAccountService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailAccountService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailAccountServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailAccountServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailAccountServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailAccountServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailLogService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailLogService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailLogService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailLogService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailLogServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailLogServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailLogServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailLogServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailSendService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailSendService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailSendService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailSendService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailSendServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailSendServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailSendServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailSendServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailTemplateService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailTemplateService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailTemplateService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailTemplateService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailTemplateServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailTemplateServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/mail/MailTemplateServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/mail/MailTemplateServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/member/MemberService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/member/MemberService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/member/MemberService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/member/MemberService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/member/MemberServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/member/MemberServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/member/MemberServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/member/MemberServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/member/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/member/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/member/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/member/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notice/NoticeService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notice/NoticeService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notice/NoticeService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notice/NoticeService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notice/NoticeServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notice/NoticeServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notice/NoticeServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notice/NoticeServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifyMessageService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifyMessageService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifyMessageService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifyMessageService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifyMessageServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifyMessageServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifyMessageServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifyMessageServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifySendService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifySendService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifySendService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifySendService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifySendServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifySendServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifySendServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifySendServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifyTemplateService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifyTemplateService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifyTemplateService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifyTemplateService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifyTemplateServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifyTemplateServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/notify/NotifyTemplateServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/notify/NotifyTemplateServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ApproveService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ApproveService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ApproveService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ApproveService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ApproveServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ApproveServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ApproveServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ApproveServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ClientService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ClientService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ClientService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ClientService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ClientServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ClientServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ClientServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2ClientServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2CodeService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2CodeService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2CodeService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2CodeService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2CodeServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2CodeServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2CodeServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2CodeServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2GrantService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2GrantService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2GrantService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2GrantService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2GrantServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2GrantServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2GrantServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2GrantServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2TokenService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2TokenService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2TokenService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2TokenService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2TokenServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2TokenServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2TokenServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/oauth2/OAuth2TokenServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/MenuService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/MenuService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/MenuService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/MenuService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/MenuServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/MenuServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/MenuServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/MenuServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/PermissionService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/PermissionService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/PermissionService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/PermissionService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/PermissionServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/PermissionServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/PermissionServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/PermissionServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/RoleService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/RoleService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/RoleService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/RoleService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/RoleServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/RoleServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/permission/RoleServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/permission/RoleServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsChannelService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsChannelService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsChannelService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsChannelService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsChannelServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsChannelServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsChannelServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsChannelServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsCodeService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsCodeService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsCodeService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsCodeService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsCodeServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsCodeServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsCodeServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsCodeServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsLogService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsLogService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsLogService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsLogService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsLogServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsLogServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsLogServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsLogServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsSendService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsSendService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsSendService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsSendService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsSendServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsSendServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsSendServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsSendServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsTemplateService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsTemplateService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsTemplateService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsTemplateService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsTemplateServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsTemplateServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/sms/SmsTemplateServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/sms/SmsTemplateServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/social/SocialClientService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/social/SocialClientService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/social/SocialClientService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/social/SocialClientService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/social/SocialClientServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/social/SocialClientServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/social/SocialClientServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/social/SocialClientServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/social/SocialUserService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/social/SocialUserService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/social/SocialUserService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/social/SocialUserService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/social/SocialUserServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/social/SocialUserServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/social/SocialUserServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/social/SocialUserServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/TenantPackageService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/TenantPackageService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/TenantPackageService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/TenantPackageService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/TenantPackageServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/TenantPackageServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/TenantPackageServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/TenantPackageServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/TenantService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/TenantService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/TenantService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/TenantService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/TenantServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/TenantServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/TenantServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/TenantServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/handler/TenantInfoHandler.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/handler/TenantInfoHandler.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/handler/TenantInfoHandler.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/handler/TenantInfoHandler.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/handler/TenantMenuHandler.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/handler/TenantMenuHandler.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/tenant/handler/TenantMenuHandler.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/tenant/handler/TenantMenuHandler.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/user/AdminUserService.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/user/AdminUserService.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/user/AdminUserService.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/user/AdminUserService.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/user/AdminUserServiceImpl.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/user/AdminUserServiceImpl.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/service/user/AdminUserServiceImpl.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/user/AdminUserServiceImpl.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/util/oauth2/OAuth2Utils.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/util/oauth2/OAuth2Utils.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/util/oauth2/OAuth2Utils.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/util/oauth2/OAuth2Utils.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/util/package-info.java b/tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/util/package-info.java similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/java/com/tashow/cloud/system/util/package-info.java rename to tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/util/package-info.java diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService b/tashow-module/tashow-module-system/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService rename to tashow-module/tashow-module-system/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService diff --git a/tashow-module/tashow-module-system/src/main/resources/application-local.yaml b/tashow-module/tashow-module-system/src/main/resources/application-local.yaml new file mode 100644 index 0000000..04c956f --- /dev/null +++ b/tashow-module/tashow-module-system/src/main/resources/application-local.yaml @@ -0,0 +1,15 @@ +spring: + cloud: + nacos: + server-addr: 43.139.42.137:8848 # Nacos 服务器地址 + username: nacos # Nacos 账号 + password: nacos # Nacos 密码 + discovery: # 【配置中心】配置项 + namespace: liwq # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP + metadata: + version: 1.0.0 # 服务实例的版本号，可用于灰度发布 + config: # 【注册中心】配置项 + namespace: liwq # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP + diff --git a/tashow-module/tashow-module-system/src/main/resources/application.yaml b/tashow-module/tashow-module-system/src/main/resources/application.yaml new file mode 100644 index 0000000..ab25c7d --- /dev/null +++ b/tashow-module/tashow-module-system/src/main/resources/application.yaml @@ -0,0 +1,17 @@ +server: + port: 48081 +spring: + application: + name: system-server + profiles: + active: local + config: + import: + - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 + - optional:nacos:application.yaml # 加载【Nacos】通用的配置 + - optional:nacos:tenant.yaml # 加载【Nacos】通用的配置 + - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 + + + + diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg1.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg1.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg2.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg2.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg3.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg3.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg4.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg4.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg5.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg5.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg6.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg6.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg7.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg7.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg8.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg8.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg9.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/original/bg9.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/1.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/1.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/10.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/10.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/11.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/11.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/12.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/12.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/13.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/13.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/14.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/14.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/15.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/15.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/16.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/16.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/17.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/17.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/18.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/18.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/19.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/19.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/8.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/8.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/9.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/11/9.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/2.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/2.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/3.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/3.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png b/tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/4.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png rename to tashow-module/tashow-module-system/src/main/resources/images/jigsaw/slidingBlock/4.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg1.png b/tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg1.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg1.png rename to tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg1.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg10.png b/tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg10.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg10.png rename to tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg10.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg2.png b/tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg2.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg2.png rename to tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg2.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg3.png b/tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg3.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg3.png rename to tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg3.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg4.png b/tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg4.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg4.png rename to tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg4.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg5.png b/tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg5.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg5.png rename to tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg5.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg6.png b/tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg6.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg6.png rename to tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg6.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg7.png b/tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg7.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg7.png rename to tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg7.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg8.png b/tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg8.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg8.png rename to tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg8.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg9.png b/tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg9.png similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/images/pic-click/bg9.png rename to tashow-module/tashow-module-system/src/main/resources/images/pic-click/bg9.png diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/logback-spring.xml b/tashow-module/tashow-module-system/src/main/resources/logback-spring.xml similarity index 100% rename from tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/logback-spring.xml rename to tashow-module/tashow-module-system/src/main/resources/logback-spring.xml diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/pom.xml b/tashow-module/tashow-module-system/tashow-module-system-biz/pom.xml deleted file mode 100644 index b389658..0000000 --- a/tashow-module/tashow-module-system/tashow-module-system-biz/pom.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - com.tashow.cloud - tashow-module-system - ${revision} - - 4.0.0 - tashow-module-system-biz - jar - - ${project.artifactId} - - system 模块下，我们放通用业务，支撑上层的核心业务。 - 例如说：用户、部门、权限、数据字典等等 - - - - - - com.tashow.cloud - tashow-framework-env - - - - - com.tashow.cloud - tashow-module-system-api - ${revision} - - - com.tashow.cloud - tashow-module-infra-api - ${revision} - - - - - com.tashow.cloud - tashow-data-permission - - - com.tashow.cloud - tashow-framework-tenant - - - - - com.tashow.cloud - tashow-framework-security - - - - - com.tashow.cloud - tashow-data-mybatis - - - - com.tashow.cloud - tashow-data-redis - - - - - com.tashow.cloud - tashow-framework-rpc - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.tashow.cloud - tashow-framework-job - - - - - com.tashow.cloud - tashow-framework-mq - - - - - - - - - - - com.tashow.cloud - tashow-data-excel - - - - org.springframework.boot - spring-boot-starter-mail - - - - - com.tashow.cloud - tashow-framework-monitor - - - - - com.xingyuv - spring-boot-starter-justauth - - - - com.github.binarywang - wx-java-mp-spring-boot-starter - - - com.github.binarywang - wx-java-miniapp-spring-boot-starter - - - - com.xingyuv - spring-boot-starter-captcha-plus - - - - org.dromara.hutool - hutool-extra - - - - - - - ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - repackage - - - - - - - - diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application.yaml b/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application.yaml deleted file mode 100644 index 0d0e5b5..0000000 --- a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application.yaml +++ /dev/null @@ -1,192 +0,0 @@ -server: - port: 48081 -spring: - application: - name: user-server - profiles: - active: local - main: - allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Feign 等会存在重复定义的服务 - config: - import: - - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 - - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 - # Servlet 配置 - servlet: - # 文件上传相关配置项 - multipart: - max-file-size: 16MB # 单个文件大小 - max-request-size: 32MB # 设置总上传的文件大小 - # Jackson 配置项 - jackson: - serialization: - write-dates-as-timestamps: true # 设置 LocalDateTime 的格式，使用时间戳 - write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401，而是直接 1611460870401 - write-durations-as-timestamps: true # 设置 Duration 的格式，使用时间戳 - fail-on-empty-beans: false # 允许序列化无属性的 Bean - # Cache 配置项 - cache: - type: REDIS - redis: - time-to-live: 1h # 设置过期时间为 1 小时 - - -logging: - file: - name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 - ---- #################### 接口文档配置 #################### - -springdoc: - api-docs: - enabled: true # 1. 是否开启 Swagger 接文档的元数据 - path: /v3/api-docs - swagger-ui: - enabled: true # 2.1 是否开启 Swagger 文档的官方 UI 界面 - path: /swagger-ui - default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档 - -knife4j: - enable: true # 2.2 是否开启 Swagger 文档的 Knife4j UI 界面 - setting: - language: zh_cn - -# MyBatis Plus 的配置项 -mybatis-plus: - configuration: - map-underscore-to-camel-case: true #虽然默认为 true ，但是还是显示去指定下。 - global-config: - db-config: - id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。 - logic-delete-value: 1 # 逻辑已删除值(默认为 1) - logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) - banner: false # 关闭控制台的 Banner 打印 - type-aliases-package: ${tashow.info.base-package}.dal.dataobject - encryptor: - password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成 - -mybatis-plus-join: - banner: false # 关闭控制台的 Banner 打印 - -# Spring Data Redis 配置 -spring: - data: - redis: - repositories: - enabled: false # 项目未使用到 Spring Data Redis 的 Repository，所以直接禁用，保证启动速度 - -# VO 转换（数据翻译）相关 -easy-trans: - is-enable-global: true # 启用全局翻译（拦截所有 SpringMVC ResponseBody 进行自动翻译 )。如果对于性能要求很高可关闭此配置，或通过 @IgnoreTrans 忽略某个接口 - ---- #################### RPC 远程调用相关配置 #################### - ---- #################### 消息队列相关 #################### -spring: - # Kafka 配置项，对应 KafkaProperties 配置类 - kafka: - # Kafka Producer 配置项 - producer: - acks: 1 # 0-不应答。1-leader 应答。all-所有 leader 和 follower 应答。 - retries: 3 # 发送失败时，重试发送的次数 - value-serializer: org.springframework.kafka.support.serializer.JsonSerializer # 消息的 value 的序列化 - # Kafka Consumer 配置项 - consumer: - auto-offset-reset: earliest # 设置消费者分组最初的消费进度为 earliest 。可参考博客 https://blog.csdn.net/lishuangzhe7047/article/details/74530417 理解 - value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer - properties: - spring.json.trusted.packages: '*' - # Kafka Consumer Listener 监听器配置 - listener: - missing-topics-fatal: false # 消费监听接口监听的主题不存在时，默认会报错。所以通过设置为 false ，解决报错 - ---- #################### 定时任务相关配置 #################### - -xxl: - job: - executor: - appname: ${spring.application.name} # 执行器 AppName - logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 - accessToken: default_token # 执行器通讯TOKEN - ---- #################### 验证码相关配置 #################### - -aj: - captcha: - jigsaw: classpath:images/jigsaw # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径 - pic-click: classpath:images/pic-click # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径 - cache-type: redis # 缓存 local/redis... - cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存 - timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行 - type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选 - water-mark: 他秀 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode - interference-options: 0 # 滑动干扰项(0/1/2) - req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false - req-get-lock-limit: 5 # 验证失败5次，get接口锁定 - req-get-lock-seconds: 10 # 验证失败后，锁定时间间隔 - req-get-minute-limit: 30 # get 接口一分钟内请求数限制 - req-check-minute-limit: 60 # check 接口一分钟内请求数限制 - req-verify-minute-limit: 60 # verify 接口一分钟内请求数限制 - ---- #################### 芋道相关配置 #################### - -tashow: - info: - version: 1.0.0 - base-package: com.tashow.cloud.system - web: - admin-ui: - url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 - xss: - enable: false - exclude-urls: # 如下 url，仅仅是为了演示，去掉配置也没关系 - - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 - swagger: - title: 管理后台 - description: 提供管理员管理的所有功能 - version: ${tashow.info.version} - tenant: # 多租户相关配置项 - enable: true - ignore-urls: - - /admin-api/system/tenant/get-id-by-name # 基于名字获取租户，不许带租户编号 - - /admin-api/system/tenant/get-by-website # 基于域名获取租户，不许带租户编号 - - /admin-api/system/captcha/get-image # 获取图片验证码，和租户无关 - - /admin-api/system/captcha/get # 获取图片验证码，和租户无关 - - /admin-api/system/captcha/check # 校验图片验证码，和租户无关 - - /admin-api/system/sms/callback/* # 短信回调接口，无法带上租户编号 - - /rpc-api/system/tenant/valid # 防止递归。避免调用 /rpc-api/system/tenant/valid 接口时，又去触发 /rpc-api/system/tenant/valid 去校验 - - /rpc-api/system/tenant/id-list # 获得租户列表的时候，无需传递租户编号 - - /rpc-api/system/oauth2/token/check # 访问令牌校验时，无需传递租户编号；主要解决上传文件的场景，前端不会传递 tenant-id！ - ignore-tables: - - system_tenant - - system_tenant_package - - system_dict_data - - system_dict_type - - system_error_code - - system_menu - - system_sms_channel - - system_sms_template - - system_sms_log - - system_sensitive_word - - system_oauth2_client - - system_mail_account - - system_mail_template - - system_mail_log - - system_notify_template - ignore-caches: - - user_role_ids - - permission_menu_ids - - oauth_client - - notify_template - - mail_account - - mail_template - - sms_template - sms-code: # 短信验证码相关的配置项 - expire-times: 10m - send-frequency: 1m - send-maximum-quantity-per-day: 10 - begin-code: 9999 # 这里配置 9999 的原因是，测试方便。 - end-code: 9999 # 这里配置 9999 的原因是，测试方便。 - -debug: false