Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yingdesai

buildpackage/src/main/java/com/hzya/frame/WebappApplication.java

@@ -13,12 +13,11 @@ import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
 
 @EnableCaching
-@ServletComponentScan(basePackages = {"com.hzya.frame"})
+@ServletComponentScan(basePackages = {"com.hzya.frame" ,"org.jeecg.modules.jmreport","com.jimureport.demo"})
 @ImportResource(locations = {"classpath:cfgHome/**/spring/spring-*.xml"})
 @Import({DruidDynamicDataSourceConfiguration.class, DynamicDataSourceCreatorAutoConfiguration.class, DynamicDataSourceAssistConfiguration.class})
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
-//@SpringBootApplication(scanBasePackages = {"com.hzya.frame"})
 public class WebappApplication {
 
     public static void main(String[] args) {

buildpackage/src/main/resources/application.yml

@@ -72,6 +72,34 @@ mybatis-plus:
   global-config:
     db-config:
       id-type: auto  # 主键策略
-ax:
-  url:
-
+# 积木报表工具
+#JimuReport[minidao配置]
+minidao :
+  base-package: org.jeecg.modules.jmreport.desreport.dao*
+  db-type: mysql
+#JimuReport[上传配置]
+jeecg :
+  jmreport:
+    # 自动保存
+    autoSave: true
+    # 单位毫秒 默认5*60*1000
+    interval: 10000
+  # local|minio|alioss
+  uploadType: local
+  # local
+  path :
+    #文件路径
+    upload: D:\images
+  # alioss
+  oss:
+    endpoint: oss-cn-beijing.aliyuncs.com
+    accessKey: ??
+    secretKey: ??
+    staticDomain: ??
+    bucketName: ??
+  # minio
+  minio:
+    minio_url: http://minio.jeecg.com
+    minio_name: ??
+    minio_pass: ??
+    bucketName: ??

pom.xml

@@ -59,7 +59,9 @@
         <unit.version>4.12</unit.version>
         <quartz.version>2.3.0</quartz.version>
         <org.springframework.version>5.3.23</org.springframework.version>
-
+        <minio.version>8.0.3</minio.version>
+        <postgresql.version>42.2.6</postgresql.version>
+        <jimureport.version>1.7.4</jimureport.version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -331,6 +333,29 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-cache</artifactId>
         </dependency>
+
+
+        <!-- JimuReport 积木报表 -->
+        <dependency>
+            <groupId>org.jeecgframework.jimureport</groupId>
+            <artifactId>jimureport-spring-boot-starter</artifactId>
+            <version>${jimureport.version}</version>
+        </dependency>
+        <!-- minio oss-->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>${minio.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <!-- postgresql驱动 -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -419,6 +444,23 @@
             </snapshots>
         </repository>
 
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun Repository</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>jeecg</id>
+            <name>jeecg Repository</name>
+            <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+
     </repositories>
 
 </project>