Browse Source

fix: 报表 yml 调整

master
wangxiang 2 years ago
parent
commit
94b2c99726
  1. 14
      kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/config/ReportConfiguration.java
  2. 4
      kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/properties/ReportDatabaseProperties.java
  3. 23
      kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/props/ReportProperties.java
  4. 2
      kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/provider/DatabaseProvider.java
  5. 27
      kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/provider/ReportPlaceholderProvider.java
  6. 4
      kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/ureport.properties

14
kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/config/ReportConfiguration.java

@ -1,13 +1,10 @@ @@ -1,13 +1,10 @@
package com.cloud.kicc.report.config;
import com.bstek.ureport.UReportPropertyPlaceholderConfigurer;
import com.bstek.ureport.console.UReportServlet;
import com.bstek.ureport.provider.report.ReportProvider;
import com.cloud.kicc.report.provider.DatabaseProvider;
import com.cloud.kicc.report.datasource.ReportDataSource;
import com.cloud.kicc.report.props.ReportDatabaseProperties;
import com.cloud.kicc.report.props.ReportProperties;
import com.cloud.kicc.report.provider.ReportPlaceholderProvider;
import com.cloud.kicc.report.properties.ReportDatabaseProperties;
import com.cloud.kicc.report.provider.DatabaseProvider;
import com.cloud.kicc.report.service.IReportFileService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@ -32,7 +29,7 @@ import javax.sql.DataSource; @@ -32,7 +29,7 @@ import javax.sql.DataSource;
@Order
@Configuration
@ConditionalOnProperty(value = "report.enabled", havingValue = "true", matchIfMissing = true)
@EnableConfigurationProperties({ReportProperties.class, ReportDatabaseProperties.class})
@EnableConfigurationProperties(ReportDatabaseProperties.class)
@ImportResource("classpath:ureport-console-context.xml")
public class ReportConfiguration {
@ -41,11 +38,6 @@ public class ReportConfiguration { @@ -41,11 +38,6 @@ public class ReportConfiguration {
return new ServletRegistrationBean<>(new UReportServlet(), "/ureport/*");
}
@Bean
public UReportPropertyPlaceholderConfigurer uReportPropertyPlaceholderConfigurer(ReportProperties properties) {
return new ReportPlaceholderProvider(properties);
}
@Bean
@ConditionalOnMissingBean
public ReportProvider reportProvider(ReportDatabaseProperties properties, IReportFileService service) {

4
kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/props/ReportDatabaseProperties.java → kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/properties/ReportDatabaseProperties.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package com.cloud.kicc.report.props;
package com.cloud.kicc.report.properties;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ -12,7 +12,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @@ -12,7 +12,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @since: 2023/7/5
*/
@Data
@ConfigurationProperties(prefix = "report.database.provider")
@ConfigurationProperties(prefix = "report.database-provider")
public class ReportDatabaseProperties {
private String name = "数据库文件系统";
private String prefix = "kicc-";

23
kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/props/ReportProperties.java

@ -1,23 +0,0 @@ @@ -1,23 +0,0 @@
package com.cloud.kicc.report.props;
import com.cloud.kicc.common.core.constant.StringPool;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
*<p>
* UReport配置类
*</p>
*
* @Author: wangxiang4
* @since: 2023/7/5
*/
@Data
@ConfigurationProperties(prefix = "report")
public class ReportProperties {
private Boolean enabled = true;
private Boolean disableHttpSessionReportCache = false;
private Boolean disableFileProvider = true;
private String fileStoreDir = StringPool.EMPTY;
private Boolean debug = false;
}

2
kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/provider/DatabaseProvider.java

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.bstek.ureport.provider.report.ReportFile;
import com.bstek.ureport.provider.report.ReportProvider;
import com.cloud.kicc.report.api.entity.ReportSystemFile;
import com.cloud.kicc.report.props.ReportDatabaseProperties;
import com.cloud.kicc.report.properties.ReportDatabaseProperties;
import com.cloud.kicc.report.service.IReportFileService;
import lombok.RequiredArgsConstructor;

27
kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/provider/ReportPlaceholderProvider.java

@ -1,27 +0,0 @@ @@ -1,27 +0,0 @@
package com.cloud.kicc.report.provider;
import com.bstek.ureport.UReportPropertyPlaceholderConfigurer;
import com.cloud.kicc.report.props.ReportProperties;
import java.util.Properties;
/**
*<p>
* UReport自定义配置
*</p>
*
* @Author: wangxiang4
* @since: 2023/7/5
*/
public class ReportPlaceholderProvider extends UReportPropertyPlaceholderConfigurer {
public ReportPlaceholderProvider(ReportProperties properties) {
Properties props = new Properties();
props.setProperty("ureport.disableHttpSessionReportCache", properties.getDisableHttpSessionReportCache().toString());
props.setProperty("ureport.disableFileProvider", properties.getDisableFileProvider().toString());
props.setProperty("ureport.fileStoreDir", properties.getFileStoreDir());
props.setProperty("ureport.debug", properties.getDebug().toString());
this.setProperties(props);
}
}

4
kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/ureport.properties

@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
ureport.disableHttpSessionReportCache=false
ureport.disableFileProvider=true
ureport.fileStoreDir=
ureport.debug=false
Loading…
Cancel
Save