From 9070f1f08abd351088f1a55b39f8106a99770b67 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 15 May 2025 19:09:39 +0800 Subject: [PATCH] =?UTF-8?q?reactor=EF=BC=9Areport=20=E7=9A=84=20-biz=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E9=87=8D=E6=9E=84=E6=88=90=20-serve?= =?UTF-8?q?r=20=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=84=8F=E4=B9=89=E6=9B=B4?= =?UTF-8?q?=E6=98=8E=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-module-report/pom.xml | 2 +- .../framework/rpc/config/RpcConfiguration.java | 13 ------------- .../Dockerfile | 6 +++--- .../pom.xml | 2 +- .../module/report/ReportServerApplication.java | 0 .../controller/admin/ajreport/package-info.java | 0 .../admin/goview/GoViewDataController.java | 0 .../admin/goview/GoViewProjectController.java | 0 .../goview/vo/data/GoViewDataGetBySqlReqVO.java | 0 .../admin/goview/vo/data/GoViewDataRespVO.java | 0 .../goview/vo/project/GoViewProjectCreateReqVO.java | 0 .../goview/vo/project/GoViewProjectRespVO.java | 0 .../goview/vo/project/GoViewProjectUpdateReqVO.java | 0 .../module/report/controller/package-info.java | 0 .../report/convert/ajreport/package-info.java | 0 .../report/convert/goview/GoViewProjectConvert.java | 0 .../dal/dataobject/ajreport/package-info.java | 0 .../dal/dataobject/goview/GoViewProjectDO.java | 0 .../report/dal/mysql/ajreport/package-info.java | 0 .../dal/mysql/goview/GoViewProjectMapper.java | 0 .../jmreport/config/JmReportConfiguration.java | 3 ++- .../core/service/JmOnlDragExternalServiceImpl.java | 0 .../core/service/JmReportTokenServiceImpl.java | 3 ++- .../framework/jmreport/core/web/package-info.java | 0 .../yudao/module/report/framework/package-info.java | 0 .../framework/rpc/config/RpcConfiguration.java | 9 +++++++++ .../module/report/framework/rpc/package-info.java | 0 .../security/config/SecurityConfiguration.java | 0 .../framework/security/core/package-info.java | 0 .../iocoder/yudao/module/report/package-info.java | 0 .../report/service/ajreport/package-info.java | 0 .../report/service/goview/GoViewDataService.java | 0 .../service/goview/GoViewDataServiceImpl.java | 0 .../report/service/goview/GoViewProjectService.java | 0 .../service/goview/GoViewProjectServiceImpl.java | 0 .../src/main/resources/application-dev.yaml | 0 .../src/main/resources/application-local.yaml | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/logback-spring.xml | 0 .../service/goview/GoViewDataServiceImplTest.java | 0 .../goview/GoViewProjectServiceImplTest.java | 0 .../src/test/resources/application-unit-test.yaml | 0 .../src/test/resources/logback.xml | 0 .../src/test/resources/sql/clean.sql | 0 .../src/test/resources/sql/create_tables.sql | 0 yudao-server/pom.xml | 2 +- 46 files changed, 19 insertions(+), 21 deletions(-) delete mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/config/RpcConfiguration.java rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/Dockerfile (82%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/pom.xml (98%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java (93%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmOnlDragExternalServiceImpl.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java (97%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java (100%) create mode 100644 yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/config/RpcConfiguration.java rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/package-info.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/package-info.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/resources/application-dev.yaml (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/resources/application-local.yaml (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/resources/application.yaml (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/main/resources/logback-spring.xml (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/test/resources/application-unit-test.yaml (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/test/resources/logback.xml (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/test/resources/sql/clean.sql (100%) rename yudao-module-report/{yudao-module-report-biz => yudao-module-report-server}/src/test/resources/sql/create_tables.sql (100%) diff --git a/yudao-module-report/pom.xml b/yudao-module-report/pom.xml index 2c8aecedc..94079e9d1 100644 --- a/yudao-module-report/pom.xml +++ b/yudao-module-report/pom.xml @@ -10,7 +10,7 @@ 4.0.0 yudao-module-report-api - yudao-module-report-biz + yudao-module-report-server yudao-module-report pom diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/config/RpcConfiguration.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/config/RpcConfiguration.java deleted file mode 100644 index 76bc91711..000000000 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/config/RpcConfiguration.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.iocoder.yudao.module.report.framework.rpc.config; - -import cn.iocoder.yudao.module.infra.api.config.ConfigApi; -import cn.iocoder.yudao.module.infra.api.file.FileApi; -import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi; -import cn.iocoder.yudao.module.system.api.permission.PermissionApi; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Configuration; - -@Configuration(value = "reportRpcConfiguration", proxyBeanMethods = false) -@EnableFeignClients(clients = {PermissionApi.class}) -public class RpcConfiguration { -} diff --git a/yudao-module-report/yudao-module-report-biz/Dockerfile b/yudao-module-report/yudao-module-report-server/Dockerfile similarity index 82% rename from yudao-module-report/yudao-module-report-biz/Dockerfile rename to yudao-module-report/yudao-module-report-server/Dockerfile index e3ba9b530..a17ce0b7c 100644 --- a/yudao-module-report/yudao-module-report-biz/Dockerfile +++ b/yudao-module-report/yudao-module-report-server/Dockerfile @@ -3,10 +3,10 @@ FROM eclipse-temurin:21-jre ## 创建目录，并使用它作为工作目录 -RUN mkdir -p /yudao-module-report-biz -WORKDIR /yudao-module-report-biz +RUN mkdir -p /yudao-module-report-server +WORKDIR /yudao-module-report-server ## 将后端项目的 Jar 文件，复制到镜像中 -COPY ./target/yudao-module-report-biz.jar app.jar +COPY ./target/yudao-module-report-server.jar app.jar ## 设置 TZ 时区 ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 diff --git a/yudao-module-report/yudao-module-report-biz/pom.xml b/yudao-module-report/yudao-module-report-server/pom.xml similarity index 98% rename from yudao-module-report/yudao-module-report-biz/pom.xml rename to yudao-module-report/yudao-module-report-server/pom.xml index 7dfbb2701..54bc7dac5 100644 --- a/yudao-module-report/yudao-module-report-biz/pom.xml +++ b/yudao-module-report/yudao-module-report-server/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - yudao-module-report-biz + yudao-module-report-server jar ${project.artifactId} diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java similarity index 93% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java index f0e9ed180..54bf9be98 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java +++ b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.report.framework.jmreport.config; +import cn.iocoder.yudao.framework.common.biz.system.permission.PermissionCommonApi; import cn.iocoder.yudao.framework.security.config.SecurityProperties; import cn.iocoder.yudao.module.report.framework.jmreport.core.service.JmOnlDragExternalServiceImpl; import cn.iocoder.yudao.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl; @@ -22,7 +23,7 @@ public class JmReportConfiguration { @Bean public JmReportTokenServiceI jmReportTokenService(OAuth2TokenCommonApi oAuth2TokenApi, - PermissionApi permissionApi, + PermissionCommonApi permissionApi, SecurityProperties securityProperties) { return new JmReportTokenServiceImpl(oAuth2TokenApi, permissionApi, securityProperties); } diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmOnlDragExternalServiceImpl.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmOnlDragExternalServiceImpl.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmOnlDragExternalServiceImpl.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmOnlDragExternalServiceImpl.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java similarity index 97% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java index 1cf79ff4a..afd1e87b2 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java +++ b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.report.framework.jmreport.core.service; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.iocoder.yudao.framework.common.biz.system.permission.PermissionCommonApi; import cn.iocoder.yudao.framework.common.exception.ServiceException; import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; import cn.iocoder.yudao.framework.security.config.SecurityProperties; @@ -38,7 +39,7 @@ public class JmReportTokenServiceImpl implements JmReportTokenServiceI { private static final String AUTHORIZATION_FORMAT = SecurityFrameworkUtils.AUTHORIZATION_BEARER + " %s"; private final OAuth2TokenCommonApi oauth2TokenApi; - private final PermissionApi permissionApi; + private final PermissionCommonApi permissionApi; private final SecurityProperties securityProperties; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java diff --git a/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/config/RpcConfiguration.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/config/RpcConfiguration.java new file mode 100644 index 000000000..f58a00ecf --- /dev/null +++ b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/config/RpcConfiguration.java @@ -0,0 +1,9 @@ +package cn.iocoder.yudao.module.report.framework.rpc.config; + +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Configuration; + +@Configuration(value = "reportRpcConfiguration", proxyBeanMethods = false) +@EnableFeignClients() +public class RpcConfiguration { +} diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/rpc/package-info.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/package-info.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java b/yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java rename to yudao-module-report/yudao-module-report-server/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application-dev.yaml b/yudao-module-report/yudao-module-report-server/src/main/resources/application-dev.yaml similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/resources/application-dev.yaml rename to yudao-module-report/yudao-module-report-server/src/main/resources/application-dev.yaml diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml b/yudao-module-report/yudao-module-report-server/src/main/resources/application-local.yaml similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml rename to yudao-module-report/yudao-module-report-server/src/main/resources/application-local.yaml diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml b/yudao-module-report/yudao-module-report-server/src/main/resources/application.yaml similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml rename to yudao-module-report/yudao-module-report-server/src/main/resources/application.yaml diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/logback-spring.xml b/yudao-module-report/yudao-module-report-server/src/main/resources/logback-spring.xml similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/resources/logback-spring.xml rename to yudao-module-report/yudao-module-report-server/src/main/resources/logback-spring.xml diff --git a/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java b/yudao-module-report/yudao-module-report-server/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java rename to yudao-module-report/yudao-module-report-server/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java diff --git a/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java b/yudao-module-report/yudao-module-report-server/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java rename to yudao-module-report/yudao-module-report-server/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml b/yudao-module-report/yudao-module-report-server/src/test/resources/application-unit-test.yaml similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml rename to yudao-module-report/yudao-module-report-server/src/test/resources/application-unit-test.yaml diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/logback.xml b/yudao-module-report/yudao-module-report-server/src/test/resources/logback.xml similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/test/resources/logback.xml rename to yudao-module-report/yudao-module-report-server/src/test/resources/logback.xml diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/sql/clean.sql b/yudao-module-report/yudao-module-report-server/src/test/resources/sql/clean.sql similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/test/resources/sql/clean.sql rename to yudao-module-report/yudao-module-report-server/src/test/resources/sql/clean.sql diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/sql/create_tables.sql b/yudao-module-report/yudao-module-report-server/src/test/resources/sql/create_tables.sql similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/test/resources/sql/create_tables.sql rename to yudao-module-report/yudao-module-report-server/src/test/resources/sql/create_tables.sql diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml index 85de5fc68..c88cc54d0 100644 --- a/yudao-server/pom.xml +++ b/yudao-server/pom.xml @@ -42,7 +42,7 @@ - +