修改招商积木配置

boman-ureport2/pom.xml

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>boman</artifactId>
-        <groupId>com.boman</groupId>
-        <version>2.5.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>boman-ureport2</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.bstek.ureport</groupId>
-            <artifactId>ureport2-console</artifactId>
-            <version>2.2.9</version>
-        </dependency>
-
-        <!-- SpringCloud Ailibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Ailibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Ailibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!--        &lt;!&ndash; Swagger UI &ndash;&gt;-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common DataSource -->
-        <dependency>
-            <groupId>com.boman</groupId>
-            <artifactId>boman-common-datasource</artifactId>
-        </dependency>
-
-        <!--         RuoYi Common DataScope-->
-        <dependency>
-            <groupId>com.boman</groupId>
-            <artifactId>boman-common-datascope</artifactId>
-        </dependency>
-
-        <!--         RuoYi Common Log-->
-        <dependency>
-            <groupId>com.boman</groupId>
-            <artifactId>boman-common-log</artifactId>
-        </dependency>
-
-        <!--         RuoYi Common Swagger-->
-        <dependency>
-            <groupId>com.boman</groupId>
-            <artifactId>boman-common-swagger</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>sonatype</id>
-            <url>https://oss.sonatype.org/content/groups/public/</url>
-        </repository>
-    </repositories>
-
-</project>

boman-ureport2/src/main/java/com/boman/ureport2/BomanUReport2Application.java

@@ -1,35 +0,0 @@
-//package com.boman.ureport2;
-//
-//import com.boman.common.security.annotation.EnableCustomConfig;
-//import com.boman.common.security.annotation.EnableRyFeignClients;
-//import com.boman.common.swagger.annotation.EnableCustomSwagger2;
-//import org.springframework.boot.SpringApplication;
-//import org.springframework.cloud.client.SpringCloudApplication;
-//import org.springframework.context.annotation.ComponentScan;
-//
-///**
-// * web-core
-// *
-// * @author shiqian
-// */
-//@EnableCustomConfig
-//@EnableCustomSwagger2
-//@EnableRyFeignClients
-//@SpringCloudApplication
-//@ComponentScan(value = {"com.boman", "com.bstek"})
-//public class BomanUReport2Application {
-//
-//    public static void main(String[] args) {
-//        SpringApplication.run(BomanUReport2Application.class, args);
-//        System.out.println();
-//        System.out.println();
-//        System.out.println("---------------------------------------------- boman-ureport2 模块启动成功----------------------------------------------");
-//        System.out.println("---------------------------------------------- boman-ureport2 模块启动成功----------------------------------------------");
-//        System.out.println("---------------------------------------------- boman-ureport2 模块启动成功----------------------------------------------");
-//        System.out.println("---------------------------------------------- boman-ureport2 模块启动成功----------------------------------------------");
-//        System.out.println("---------------------------------------------- boman-ureport2 模块启动成功----------------------------------------------");
-//        System.out.println("---------------------------------------------- boman-ureport2 模块启动成功----------------------------------------------");
-//        System.out.println();
-//        System.out.println();
-//    }
-//}

boman-ureport2/src/main/java/com/boman/ureport2/conf/UreportConfig.java

@@ -1,56 +0,0 @@
-package com.boman.ureport2.conf;
-
-import com.bstek.ureport.console.UReportServlet;
-import com.bstek.ureport.definition.datasource.BuildinDatasource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * @author shiqian
- * @date 2021年08月17日 10:06
- **/
-@ImportResource("classpath:ureport-console-context.xml")//不加项目能够启动但是会导致加载数据源报错或加载不了
-@Configuration
-public class UreportConfig implements BuildinDatasource {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(UreportConfig.class);
-
-    @Resource
-    private DataSource dataSource;
-
-
-    @Bean //定义ureport的启动servlet
-    @SuppressWarnings("unchecked")
-    public ServletRegistrationBean ureportServlet() {
-        ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new UReportServlet());
-        servletRegistrationBean.addUrlMappings("/ureport/*");
-        return servletRegistrationBean;
-    }
-
-    @Override
-    public String name() {
-        return "myUReportDatasource";
-    }
-
-    @Override
-    public Connection getConnection() {
-        try {
-            return dataSource.getConnection();
-        } catch (SQLException e) {
-            LOGGER.error("Ureport2 数据源 获取连接失败！");
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-}

boman-ureport2/src/main/resources/bootstrap-prod.yml

@@ -1,19 +0,0 @@
-server:
-  port: 3000
-
-spring:
-  application:
-    name: boman-ureport
-  profiles:
-    active: prod
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-        namespace: bbba8691-596e-436f-9b72-a28e8db0da40
-      config:
-        server-addr: 127.0.0.1:8848
-        file-extension: yml
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: bbba8691-596e-436f-9b72-a28e8db0da40

boman-ureport2/src/main/resources/bootstrap.yml

@@ -1,19 +0,0 @@
-server:
-  port: 3000
-
-spring: 
-  application:
-    name: boman-ureport
-  profiles:
-    active: jiaoyu
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.101.10:8848
-        namespace: d8110874-ad03-4826-80bc-ff00126c1644  #潜山教育局
-      config:
-        server-addr: 192.168.101.10:8848
-        file-extension: yml
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: d8110874-ad03-4826-80bc-ff00126c1644  #潜山教育局

boman-ureport2/src/main/resources/logback.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/boman-ureport" />
-   <!-- 日志输出格式 -->
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
-
-    <!-- 控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-	</appender>
-
-    <!-- 系统日志输出 -->
-	<appender name="ureport_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>WARN</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-	</appender>
-
-    <appender name="ureport_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-			<!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-			<!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-	<logger name="com.boman" level="debug" />
-	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
-
-	<root level="debug">
-		<appender-ref ref="console" />
-	</root>
-	
-	<!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="ureport_info" />
-        <appender-ref ref="ureport_error" />
-    </root>
-</configuration>

boman-ureport2/src/main/resources/ureport-console-context.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-	">
-	<import resource="classpath:ureport-core-context.xml"/>
-	<import resource="classpath:ureport-font-context.xml"/>
-	
-	<bean id="ureport.datasourceServletAction" class="com.bstek.ureport.console.designer.DatasourceServletAction"></bean>
-	<bean id="ureport.resourceLoaderServletAction" class="com.bstek.ureport.console.res.ResourceLoaderServletAction"></bean>
-
-	<bean id="ureport.designerServletAction" class="com.bstek.ureport.console.designer.DesignerServletAction">
-		<property name="reportRender" ref="ureport.reportRender"></property>
-		<property name="reportParser" ref="ureport.reportParser"></property>
-	</bean>
-	
-	<bean id="ureport.searchFormDesignerAction" class="com.bstek.ureport.console.designer.SearchFormDesignerAction"></bean>
-	
-	<bean id="ureport.htmlPreviewServletAction" class="com.bstek.ureport.console.html.HtmlPreviewServletAction">
-		<property name="exportManager" ref="ureport.exportManager"></property>
-		<property name="reportBuilder" ref="ureport.reportBuilder"></property>
-		<property name="reportRender" ref="ureport.reportRender"></property>
-	</bean>
-
-	<bean id="ureport.exportWordServletAction" class="com.bstek.ureport.console.word.ExportWordServletAction">
-		<property name="exportManager" ref="ureport.exportManager"></property>
-		<property name="reportBuilder" ref="ureport.reportBuilder"></property>
-	</bean>
-	
-	<bean id="ureport.exportPdfServletAction" class="com.bstek.ureport.console.pdf.ExportPdfServletAction">
-		<property name="exportManager" ref="ureport.exportManager"></property>
-		<property name="reportBuilder" ref="ureport.reportBuilder"></property>
-		<property name="reportRender" ref="ureport.reportRender"></property>
-	</bean>
-	
-	<bean id="ureport.exportExcelServletAction" class="com.bstek.ureport.console.excel.ExportExcelServletAction">
-		<property name="exportManager" ref="ureport.exportManager"></property>
-		<property name="reportBuilder" ref="ureport.reportBuilder"></property>
-	</bean>
-	
-	<bean id="ureport.exportExcel97ServletAction" class="com.bstek.ureport.console.excel.ExportExcel97ServletAction">
-		<property name="exportManager" ref="ureport.exportManager"></property>
-		<property name="reportBuilder" ref="ureport.reportBuilder"></property>
-	</bean>
-	
-	<bean id="ureport.imageServletAction" class="com.bstek.ureport.console.image.ImageServletAction"></bean>
-	<bean id="ureport.importExcelServletAction" class="com.bstek.ureport.console.importexcel.ImportExcelServletAction"></bean>
-	
-	<bean id="ureport.chartServletAction" class="com.bstek.ureport.console.chart.ChartServletAction"></bean>
-	
-	<bean id="ureport.httpSessionReportCache" class="com.bstek.ureport.console.cache.HttpSessionReportCache">
-		<property name="disabled" value="${ureport.disableHttpSessionReportCache}"></property>
-	</bean>
-</beans>

boman-ureport2/src/main/resources/ureport-core-context.xml

@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-	">
-	
-	<bean id="ureport.props" class="com.bstek.ureport.UReportPropertyPlaceholderConfigurer" abstract="true">
-		<property name="ignoreUnresolvablePlaceholders" value="true"></property>
-	</bean>
-	
-	<context:property-placeholder location="classpath:ureport.properties" ignore-unresolvable="true"/>
-	
-	<bean id="ureport.exportManager" class="com.bstek.ureport.export.ExportManagerImpl">
-		<property name="reportRender" ref="ureport.reportRender"></property>
-	</bean>
-	
-	<bean id="ureport.reportRender" class="com.bstek.ureport.export.ReportRender">
-		<property name="reportParser" ref="ureport.reportParser"></property>
-		<property name="reportBuilder" ref="ureport.reportBuilder"></property>
-	</bean>
-	
-	<bean id="ureport.defaultImageProvider" class="com.bstek.ureport.provider.image.DefaultImageProvider"></bean>
-	
-	<bean id="ureport.fileReportProvider" class="com.bstek.ureport.provider.report.file.FileReportProvider">
-		<property name="fileStoreDir" value="${ureport.fileStoreDir}"></property>
-		<property name="disabled" value="${ureport.disableFileProvider}"></property>
-	</bean>
-	
-	<bean id="ureport.httpImageProvider" class="com.bstek.ureport.provider.image.HttpImageProvider"></bean>
-	<bean id="ureport.httpsImageProvider" class="com.bstek.ureport.provider.image.HttpsImageProvider"></bean>
-	
-	<bean id="ureport.reportBuilder" class="com.bstek.ureport.build.ReportBuilder">
-		<property name="hideRowColumnBuilder" ref="ureport.hideRowColumnBuilder"></property>
-	</bean>
-	
-	<bean id="ureport.hideRowColumnBuilder" class="com.bstek.ureport.build.HideRowColumnBuilder"></bean>
-	
-	<bean id="ureport.reportParser" class="com.bstek.ureport.parser.ReportParser"></bean>
-	
-	<bean id="ureport.formParserUtils" class="com.bstek.ureport.parser.impl.searchform.FormParserUtils"></bean>
-	<bean id="ureport.checkboxParser" class="com.bstek.ureport.parser.impl.searchform.CheckboxParser"></bean>
-	<bean id="ureport.gridParser" class="com.bstek.ureport.parser.impl.searchform.GridParser"></bean>
-	<bean id="ureport.radioInputParser" class="com.bstek.ureport.parser.impl.searchform.RadioInputParser"></bean>
-	<bean id="ureport.rextInputParser" class="com.bstek.ureport.parser.impl.searchform.TextInputParser"></bean>
-	<bean id="ureport.resetButtonParser" class="com.bstek.ureport.parser.impl.searchform.ResetButtonParser"></bean>
-	<bean id="ureport.submitButtonParser" class="com.bstek.ureport.parser.impl.searchform.SubmitButtonParser"></bean>
-	<bean id="ureport.selectInputParser" class="com.bstek.ureport.parser.impl.searchform.SelectInputParser"></bean>
-	<bean id="ureport.datetimeInputParser" class="com.bstek.ureport.parser.impl.searchform.DatetimeInputParser"></bean>
-	
-	<bean id="ureport.classpathReportProvider" class="com.bstek.ureport.provider.report.classpath.ClasspathReportProvider"></bean>
-	
-	<bean id="ureport.fontBuilder" class="com.bstek.ureport.export.pdf.font.FontBuilder"></bean>
-	
-	<bean id="ureport.expressionUtils" class="com.bstek.ureport.expression.ExpressionUtils"></bean>
-	<bean id="ureport.utils" class="com.bstek.ureport.Utils">
-		<property name="debug" value="${ureport.debug}"></property>
-	</bean>
-	<bean id="ureport.cacheUtils" class="com.bstek.ureport.cache.CacheUtils"></bean>
-	
-	<bean id="ureport.countFunction" class="com.bstek.ureport.expression.function.CountFunction"></bean>
-	<bean id="ureport.sumFunction" class="com.bstek.ureport.expression.function.SumFunction"></bean>
-	<bean id="ureport.maxFunction" class="com.bstek.ureport.expression.function.MaxFunction"></bean>
-	<bean id="ureport.minFunction" class="com.bstek.ureport.expression.function.MinFunction"></bean>
-	<bean id="ureport.listFunction" class="com.bstek.ureport.expression.function.ListFunction"></bean>
-	<bean id="ureport.avgFunction" class="com.bstek.ureport.expression.function.AvgFunction"></bean>
-	<bean id="ureport.orderFunction" class="com.bstek.ureport.expression.function.OrderFunction"></bean>
-	<bean id="ureport.WeekFunction" class="com.bstek.ureport.expression.function.date.WeekFunction"></bean>
-	<bean id="ureport.dayFunction" class="com.bstek.ureport.expression.function.date.DayFunction"></bean>
-	<bean id="ureport.monthFunction" class="com.bstek.ureport.expression.function.date.MonthFunction"></bean>
-	<bean id="ureport.yearFunction" class="com.bstek.ureport.expression.function.date.YearFunction"></bean>
-	<bean id="ureport.dateFunction" class="com.bstek.ureport.expression.function.date.DateFunction"></bean>
-	<bean id="ureport.formatNumberFunction" class="com.bstek.ureport.expression.function.FormatNumberFunction"></bean>
-	<bean id="ureport.formatDateFunction" class="com.bstek.ureport.expression.function.FormatDateFunction"></bean>
-	<bean id="ureport.getFunction" class="com.bstek.ureport.expression.function.GetFunction"></bean>
-	
-	<bean id="ureport.absFunction" class="com.bstek.ureport.expression.function.math.AbsFunction"></bean>
-	<bean id="ureport.ceilFunction" class="com.bstek.ureport.expression.function.math.CeilFunction"></bean>
-	<bean id="ureport.ChnFunction" class="com.bstek.ureport.expression.function.math.ChnFunction"></bean>
-	<bean id="ureport.ChnMoneyFunction" class="com.bstek.ureport.expression.function.math.ChnMoneyFunction"></bean>
-	<bean id="ureport.CosFunction" class="com.bstek.ureport.expression.function.math.CosFunction"></bean>
-	<bean id="ureport.ExpFunction" class="com.bstek.ureport.expression.function.math.ExpFunction"></bean>
-	<bean id="ureport.floorFunction" class="com.bstek.ureport.expression.function.math.FloorFunction"></bean>
-	<bean id="ureport.log10Function" class="com.bstek.ureport.expression.function.math.Log10Function"></bean>
-	<bean id="ureport.logFunction" class="com.bstek.ureport.expression.function.math.LogFunction"></bean>
-	<bean id="ureport.powFunction" class="com.bstek.ureport.expression.function.math.PowFunction"></bean>
-	<bean id="ureport.randomFunction" class="com.bstek.ureport.expression.function.math.RandomFunction"></bean>
-	<bean id="ureport.roundFunction" class="com.bstek.ureport.expression.function.math.RoundFunction"></bean>
-	<bean id="ureport.sinFunction" class="com.bstek.ureport.expression.function.math.SinFunction"></bean>
-	<bean id="ureport.sqrtFunction" class="com.bstek.ureport.expression.function.math.SqrtFunction"></bean>
-	<bean id="ureport.tanFunction" class="com.bstek.ureport.expression.function.math.TanFunction"></bean>
-	<bean id="ureport.stdevpFunction" class="com.bstek.ureport.expression.function.math.StdevpFunction"></bean>
-	<bean id="ureport.varaFunction" class="com.bstek.ureport.expression.function.math.VaraFunction"></bean>
-	<bean id="ureport.modeFunction" class="com.bstek.ureport.expression.function.math.ModeFunction"></bean>
-	<bean id="ureport.medianFunction" class="com.bstek.ureport.expression.function.math.MedianFunction"></bean>
-	
-	
-	<bean id="ureport.lengthFunction" class="com.bstek.ureport.expression.function.string.LengthFunction"></bean>
-	<bean id="ureport.lowerFunction" class="com.bstek.ureport.expression.function.string.LowerFunction"></bean>
-	<bean id="ureport.IndexOfFunction" class="com.bstek.ureport.expression.function.string.IndexOfFunction"></bean>
-	<bean id="ureport.replaceFunction" class="com.bstek.ureport.expression.function.string.ReplaceFunction"></bean>
-	<bean id="ureport.substringFunction" class="com.bstek.ureport.expression.function.string.SubstringFunction"></bean>
-	<bean id="ureport.trimFunction" class="com.bstek.ureport.expression.function.string.TrimFunction"></bean>
-	<bean id="ureport.upperFunction" class="com.bstek.ureport.expression.function.string.UpperFunction"></bean>
-	
-	<bean id="ureport.pageTotalFunction" class="com.bstek.ureport.expression.function.page.PageTotalFunction"></bean>
-	<bean id="ureport.pageNumberFunction" class="com.bstek.ureport.expression.function.page.PageNumberFunction"></bean>
-	<bean id="ureport.pageAvgFunction" class="com.bstek.ureport.expression.function.page.PageAvgFunction"></bean>
-	<bean id="ureport.pageCountFunction" class="com.bstek.ureport.expression.function.page.PageCountFunction"></bean>
-	<bean id="ureport.pageMaxFunction" class="com.bstek.ureport.expression.function.page.PageMaxFunction"></bean>
-	<bean id="ureport.pageMinFunction" class="com.bstek.ureport.expression.function.page.PageMinFunction"></bean>
-	<bean id="ureport.pageRowsFunction" class="com.bstek.ureport.expression.function.page.PageRowsFunction"></bean>
-	<bean id="ureport.pageSumFunction" class="com.bstek.ureport.expression.function.page.PageSumFunction"></bean>
-	
-	<bean id="ureport.parameterFunction" class="com.bstek.ureport.expression.function.ParameterFunction"></bean>
-	<bean id="ureport.parameterIsEmptyFunction" class="com.bstek.ureport.expression.function.ParameterIsEmptyFunction"></bean>
-	<bean id="ureport.jsonFunction" class="com.bstek.ureport.expression.function.JsonFunction"></bean>
-	
-	<bean id="ureport.rowFunction" class="com.bstek.ureport.expression.function.RowFunction"></bean>
-	<bean id="ureport.columnFunction" class="com.bstek.ureport.expression.function.ColumnFunction"></bean>
-</beans>

boman-ureport2/src/main/resources/ureport-font-context.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-	">
-	<bean id="ureport.arialFontRegister" class="com.bstek.ureport.font.arial.ArialFontRegister"></bean>
-	<bean id="ureport.comicSansMSFontRegister" class="com.bstek.ureport.font.comicsansms.ComicSansMSFontRegister"></bean>
-	<bean id="ureport.courierNewFontRegister" class="com.bstek.ureport.font.couriernew.CourierNewFontRegister"></bean>
-	<bean id="ureport.fangSongFontRegister" class="com.bstek.ureport.font.fangsong.FangSongFontRegister"></bean>
-	<bean id="ureport.heiTiFontRegister" class="com.bstek.ureport.font.heiti.HeiTiFontRegister"></bean>
-	<bean id="ureport.kaiTiFontRegister" class="com.bstek.ureport.font.kaiti.KaiTiFontRegister"></bean>
-	<bean id="ureport.songTiFontRegister" class="com.bstek.ureport.font.songti.SongTiFontRegister"></bean>
-	<bean id="ureport.timesNewRomanFontRegister" class="com.bstek.ureport.font.timesnewroman.TimesNewRomanFontRegister"></bean>
-	<bean id="ureport.yaheiFontRegister" class="com.bstek.ureport.font.yahei.YaheiFontRegister"></bean>
-</beans>

src/main/java/generator/StatisticReport.java

@@ -2,13 +2,12 @@ package generator;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
+
 
 /**
  * statistic_report
  * @author 
  */
-@Data
 public class StatisticReport implements Serializable {
     /**
      * 主键
@@ -81,4 +80,141 @@ public class StatisticReport implements Serializable {
     private Date updateTime;
 
     private static final long serialVersionUID = 1L;
+
+
+    @Override
+    public String toString() {
+        return "StatisticReport{" +
+                "id=" + id +
+                ", reportName='" + reportName + '\'' +
+                ", reportId='" + reportId + '\'' +
+                ", templateName='" + templateName + '\'' +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", reportStatus='" + reportStatus + '\'' +
+                ", status='" + status + '\'' +
+                ", repUploadFile='" + repUploadFile + '\'' +
+                ", remark='" + remark + '\'' +
+                ", createBy='" + createBy + '\'' +
+                ", createTime=" + createTime +
+                ", updateBy='" + updateBy + '\'' +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getReportName() {
+        return reportName;
+    }
+
+    public void setReportName(String reportName) {
+        this.reportName = reportName;
+    }
+
+    public String getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(String reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getReportStatus() {
+        return reportStatus;
+    }
+
+    public void setReportStatus(String reportStatus) {
+        this.reportStatus = reportStatus;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getRepUploadFile() {
+        return repUploadFile;
+    }
+
+    public void setRepUploadFile(String repUploadFile) {
+        this.repUploadFile = repUploadFile;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
 }