提交报表模块

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -73,4 +73,7 @@ public interface ModuleNameConstant {
 	 */
 	String APPLICATION_SUPERVISE_NAME = "logpm-supervise"+DEVAUTH;
 
+
+	String APPLICATION_REPORT_NAME = "logpm-report"+DEVAUTH;
+
 }

blade-service-api/logpm-report-api/pom.xml

@@ -0,0 +1,18 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service-api</artifactId>
+        <version>3.2.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-report-api</artifactId>
+    <version>3.2.0.RELEASE</version>
+    <packaging>jar</packaging>
+
+</project>

blade-service-api/pom.xml

@@ -37,6 +37,9 @@
         <module>logpm-patch-api</module>
         <!--        考核督察系统-->
         <module>logpm-supervise-api</module>
+
+        <!--        报表系统-->
+        <module>logpm-report-api</module>
     </modules>
 
     <dependencies>

blade-service/logpm-report/pom.xml

@@ -0,0 +1,54 @@
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service</artifactId>
+        <version>3.2.0.RELEASE</version>
+    </parent>
+    <artifactId>logpm-report</artifactId>
+    <packaging>jar</packaging>
+    <name>logpm-report</name>
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-core-boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-swagger</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-core-auto</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-report-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <configuration>
+                    <skip>${docker.fabric.skip}</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

blade-service/logpm-report/src/main/java/com/logpm/report/ReportApplication.java

@@ -0,0 +1,16 @@
+package com.logpm.report;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.cloud.client.BladeCloudApplication;
+import org.springblade.core.launch.BladeApplication;
+
+/**
+ * @author chao
+ */
+@BladeCloudApplication
+public class ReportApplication {
+
+	public static void main(String[] args) {
+		BladeApplication.run(ModuleNameConstant.APPLICATION_REPORT_NAME, ReportApplication.class, args);
+	}
+	}

blade-service/logpm-report/src/main/java/com/logpm/report/config/ReportConfiguration.java

@@ -0,0 +1,40 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.report.config;
+
+
+import com.logpm.report.pros.ReportProperties;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 配置feign、mybatis包名、properties
+ *
+ * @author chaos
+ */
+@Configuration(proxyBeanMethods = false)
+@ComponentScan({"org.springblade", "com.logpm"})
+@EnableFeignClients({"org.springblade", "com.logpm"})
+@MapperScan({"org.springblade.**.mapper.**", "com.logpm.**.mapper.**"})
+@EnableConfigurationProperties(ReportProperties.class)
+public class ReportConfiguration {
+
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/launcher/ReportLauncherServiceImpl.java

@@ -0,0 +1,60 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.report.launcher;
+
+import org.springblade.core.auto.service.AutoService;
+import org.springblade.core.launch.constant.NacosConstant;
+import org.springblade.core.launch.service.LauncherService;
+import org.springblade.core.launch.utils.PropsUtil;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+
+import java.util.Properties;
+
+/**
+ * 启动参数拓展
+ *
+ * @author Chill
+ */
+@AutoService(LauncherService.class)
+public class ReportLauncherServiceImpl implements LauncherService {
+
+	@Override
+	public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
+		Properties props = System.getProperties();
+		// 开启多数据源
+		PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true");
+		// 指定注册配置信息
+		PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].data-id", NacosConstant.dataId(appName, profile));
+		PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].group", NacosConstant.NACOS_CONFIG_GROUP);
+		PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH);
+		// 指定注册IP
+		// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.ip", "127.0.0.1");
+		// 指定注册端口
+		// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.port", "8200");
+		// 自定义命名空间
+		// PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.NACOS_NAMESPACE);
+		// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.NACOS_NAMESPACE);
+		// 自定义分组
+		// PropsUtil.setProperty(props, "spring.cloud.nacos.config.group", NacosConstant.NACOS_CONFIG_GROUP);
+		// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.group", NacosConstant.NACOS_CONFIG_GROUP);
+	}
+
+	@Override
+	public int getOrder() {
+		return 20;
+	}
+}

blade-service/logpm-report/src/main/java/com/logpm/report/pros/ReportProperties.java

@@ -0,0 +1,21 @@
+package com.logpm.report.pros;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * FactoryProperties
+ *
+ * @author pref
+ */
+@Data
+@ConfigurationProperties(prefix = "logpm")
+public class ReportProperties {
+	/**
+	 * 名称
+	 */
+	private String name;
+
+
+
+}

blade-service/logpm-report/src/main/resources/application-dev.yml

@@ -0,0 +1,45 @@
+#服务器端口
+server:
+  port: 8900
+
+#数据源配置
+#spring:
+#  datasource:
+#    url: ${blade.datasource.dev.url}
+#    username: ${blade.datasource.dev.username}
+#    password: ${blade.datasource.dev.password}
+
+spring:
+  #排除DruidDataSourceAutoConfigure
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  datasource:
+    dynamic:
+      druid:
+        #通用校验配置
+        validation-query: select 1
+        #启用sql日志拦截器
+        proxy-filters:
+          - sqlLogInterceptor
+      #设置默认的数据源或者数据源组,默认值即为master
+      primary: master
+      datasource:
+        master:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.report.master.url}
+          username: ${blade.datasource.report.master.username}
+          password: ${blade.datasource.report.master.password}
+        slave:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.report.slave.url}
+          username: ${blade.datasource.report.slave.username}
+          password: ${blade.datasource.report.slave.password}
+

blade-service/logpm-report/src/main/resources/application-prod.yml

@@ -0,0 +1,45 @@
+#服务器端口
+server:
+  port: 8900
+
+#数据源配置
+#spring:
+#  datasource:
+#    url: ${blade.datasource.dev.url}
+#    username: ${blade.datasource.dev.username}
+#    password: ${blade.datasource.dev.password}
+
+spring:
+  #排除DruidDataSourceAutoConfigure
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  datasource:
+    dynamic:
+      druid:
+        #通用校验配置
+        validation-query: select 1
+        #启用sql日志拦截器
+        proxy-filters:
+          - sqlLogInterceptor
+      #设置默认的数据源或者数据源组,默认值即为master
+      primary: master
+      datasource:
+        master:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.report.master.url}
+          username: ${blade.datasource.report.master.username}
+          password: ${blade.datasource.report.master.password}
+        slave:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.report.slave.url}
+          username: ${blade.datasource.report.slave.username}
+          password: ${blade.datasource.report.slave.password}
+

blade-service/logpm-report/src/main/resources/application-test.yml

@@ -0,0 +1,45 @@
+#服务器端口
+server:
+  port: 8900
+
+#数据源配置
+#spring:
+#  datasource:
+#    url: ${blade.datasource.dev.url}
+#    username: ${blade.datasource.dev.username}
+#    password: ${blade.datasource.dev.password}
+
+spring:
+  #排除DruidDataSourceAutoConfigure
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  datasource:
+    dynamic:
+      druid:
+        #通用校验配置
+        validation-query: select 1
+        #启用sql日志拦截器
+        proxy-filters:
+          - sqlLogInterceptor
+      #设置默认的数据源或者数据源组,默认值即为master
+      primary: master
+      datasource:
+        master:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.report.master.url}
+          username: ${blade.datasource.report.master.username}
+          password: ${blade.datasource.report.master.password}
+        slave:
+          druid:
+            #独立校验配置
+            validation-query: select 1
+            #oracle校验
+            #validation-query: select 1 from dual
+          url: ${blade.datasource.report.slave.url}
+          username: ${blade.datasource.report.slave.username}
+          password: ${blade.datasource.report.slave.password}
+

blade-service/logpm-report/src/main/resources/application.yml

@@ -0,0 +1,32 @@
+#mybatis-plus配置
+mybatis-plus:
+  mapper-locations: classpath:com/logpm/**/mapper/*Mapper.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: com.logpm.**.entity
+
+#swagger扫描路径配置
+swagger:
+  base-packages:
+    - org.springblade
+    - com.logpm
+
+#oss配置
+oss:
+  enabled: true
+  name: minio
+  tenant-mode: false
+  endpoint: http://8.137.14.82:9000
+  access-key: minio
+  secret-key: 123123123
+  bucket-name: bladex
+
+
+logging:
+  config: classpath:logback.xml
+
+
+spring:
+  main:
+    allow-circular-references: true
+
+

blade-service/logpm-report/src/main/resources/logback.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="false" debug="false">
+
+    <contextName>logback</contextName>
+    <property name="log.path" value="./data/logpm-basic/logs/logs.log"/>
+
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>utf8</charset>
+        </encoder>
+    </appender>
+
+    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}.%d{yyyy-MM-dd}.zip</fileNamePattern>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+        <appender-ref ref="file"/>
+    </root>
+
+</configuration>

blade-service/pom.xml

@@ -42,6 +42,7 @@
         <module>logpm-patch</module>
         <!--考核督察系统-->
         <module>logpm-supervise</module>
+        <module>logpm-report</module>
 
     </modules>