reactor:report 的 -biz 模块,重构成 -server 模块,意义更明确
parent
c251fcf698
commit
9070f1f08a
|
@ -10,7 +10,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<modules>
|
<modules>
|
||||||
<module>yudao-module-report-api</module>
|
<module>yudao-module-report-api</module>
|
||||||
<module>yudao-module-report-biz</module>
|
<module>yudao-module-report-server</module>
|
||||||
</modules>
|
</modules>
|
||||||
<artifactId>yudao-module-report</artifactId>
|
<artifactId>yudao-module-report</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
|
@ -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 {
|
|
||||||
}
|
|
|
@ -3,10 +3,10 @@
|
||||||
FROM eclipse-temurin:21-jre
|
FROM eclipse-temurin:21-jre
|
||||||
|
|
||||||
## 创建目录,并使用它作为工作目录
|
## 创建目录,并使用它作为工作目录
|
||||||
RUN mkdir -p /yudao-module-report-biz
|
RUN mkdir -p /yudao-module-report-server
|
||||||
WORKDIR /yudao-module-report-biz
|
WORKDIR /yudao-module-report-server
|
||||||
## 将后端项目的 Jar 文件,复制到镜像中
|
## 将后端项目的 Jar 文件,复制到镜像中
|
||||||
COPY ./target/yudao-module-report-biz.jar app.jar
|
COPY ./target/yudao-module-report-server.jar app.jar
|
||||||
|
|
||||||
## 设置 TZ 时区
|
## 设置 TZ 时区
|
||||||
## 设置 JAVA_OPTS 环境变量,可通过 docker run -e "JAVA_OPTS=" 进行覆盖
|
## 设置 JAVA_OPTS 环境变量,可通过 docker run -e "JAVA_OPTS=" 进行覆盖
|
|
@ -9,7 +9,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>yudao-module-report-biz</artifactId>
|
<artifactId>yudao-module-report-server</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>${project.artifactId}</name>
|
<name>${project.artifactId}</name>
|
|
@ -1,5 +1,6 @@
|
||||||
package cn.iocoder.yudao.module.report.framework.jmreport.config;
|
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.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.JmOnlDragExternalServiceImpl;
|
||||||
import cn.iocoder.yudao.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl;
|
import cn.iocoder.yudao.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl;
|
||||||
|
@ -22,7 +23,7 @@ public class JmReportConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public JmReportTokenServiceI jmReportTokenService(OAuth2TokenCommonApi oAuth2TokenApi,
|
public JmReportTokenServiceI jmReportTokenService(OAuth2TokenCommonApi oAuth2TokenApi,
|
||||||
PermissionApi permissionApi,
|
PermissionCommonApi permissionApi,
|
||||||
SecurityProperties securityProperties) {
|
SecurityProperties securityProperties) {
|
||||||
return new JmReportTokenServiceImpl(oAuth2TokenApi, permissionApi, securityProperties);
|
return new JmReportTokenServiceImpl(oAuth2TokenApi, permissionApi, securityProperties);
|
||||||
}
|
}
|
|
@ -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.ObjectUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
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.exception.ServiceException;
|
||||||
import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
|
import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
|
||||||
import cn.iocoder.yudao.framework.security.config.SecurityProperties;
|
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 static final String AUTHORIZATION_FORMAT = SecurityFrameworkUtils.AUTHORIZATION_BEARER + " %s";
|
||||||
|
|
||||||
private final OAuth2TokenCommonApi oauth2TokenApi;
|
private final OAuth2TokenCommonApi oauth2TokenApi;
|
||||||
private final PermissionApi permissionApi;
|
private final PermissionCommonApi permissionApi;
|
||||||
|
|
||||||
private final SecurityProperties securityProperties;
|
private final SecurityProperties securityProperties;
|
||||||
|
|
|
@ -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 {
|
||||||
|
}
|
|
@ -42,7 +42,7 @@
|
||||||
<!-- 数据报表。默认注释,保证编译速度 -->
|
<!-- 数据报表。默认注释,保证编译速度 -->
|
||||||
<!-- <dependency>-->
|
<!-- <dependency>-->
|
||||||
<!-- <groupId>cn.iocoder.cloud</groupId>-->
|
<!-- <groupId>cn.iocoder.cloud</groupId>-->
|
||||||
<!-- <artifactId>yudao-module-report-biz</artifactId>-->
|
<!-- <artifactId>yudao-module-report-server</artifactId>-->
|
||||||
<!-- <version>${revision}</version>-->
|
<!-- <version>${revision}</version>-->
|
||||||
<!-- </dependency>-->
|
<!-- </dependency>-->
|
||||||
<!-- 工作流。默认注释,保证编译速度 -->
|
<!-- 工作流。默认注释,保证编译速度 -->
|
||||||
|
|
Loading…
Reference in New Issue