소스 검색

积木报表

shiqian 3 년 전
부모
커밋
374487614a

+ 7 - 0
boman-report/README.md

@@ -0,0 +1,7 @@
+## 引入boman-report.jar之前需要导入sql
+
+### 具体sql如下
+<a href="jimuReportSql.sql"></a>
+
+### git地址
+      git clone https://gitee.com/jeecg/JimuReport.git

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 812 - 0
boman-report/jimuReportSql.sql


+ 18 - 18
boman-admin/pom.xml → boman-report/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>jiaoyuju-admin</artifactId>
+    <artifactId>boman-report</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -54,7 +54,7 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-        <!-- Swagger UI -->
+<!--        &lt;!&ndash; Swagger UI &ndash;&gt;-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
@@ -91,22 +91,22 @@
             <artifactId>boman-common-swagger</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.boman</groupId>
-            <artifactId>boman-visual</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>commons-beanutils</groupId>-->
+<!--            <artifactId>commons-beanutils</artifactId>-->
+<!--            <version>1.9.4</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>org.projectlombok</groupId>-->
+<!--            <artifactId>lombok</artifactId>-->
+<!--            <version>1.18.4</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.boman</groupId>-->
+<!--            <artifactId>boman-visual</artifactId>-->
+<!--            <version>2.5.0-SNAPSHOT</version>-->
+<!--        </dependency>-->
 
     </dependencies>
 

+ 9 - 9
boman-admin/src/main/java/com/boman/admin/BomanAdminApplication.java → boman-report/src/main/java/com/boman/report/BomanReportApplication.java

@@ -1,4 +1,4 @@
-package com.boman.admin;
+package com.boman.report;
 
 import com.boman.common.security.annotation.EnableCustomConfig;
 import com.boman.common.security.annotation.EnableRyFeignClients;
@@ -17,18 +17,18 @@ import org.springframework.context.annotation.ComponentScan;
 @EnableRyFeignClients
 @SpringCloudApplication
 @ComponentScan(value = {"com.boman", "org.jeecg.modules.jmreport"})
-public class BomanAdminApplication {
+public class BomanReportApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(BomanAdminApplication.class, args);
+        SpringApplication.run(BomanReportApplication.class, args);
         System.out.println();
         System.out.println();
-        System.out.println("---------------------------------------------- boman-admin 模块启动成功----------------------------------------------");
-        System.out.println("---------------------------------------------- boman-admin 模块启动成功----------------------------------------------");
-        System.out.println("---------------------------------------------- boman-admin 模块启动成功----------------------------------------------");
-        System.out.println("---------------------------------------------- boman-admin 模块启动成功----------------------------------------------");
-        System.out.println("---------------------------------------------- boman-admin 模块启动成功----------------------------------------------");
-        System.out.println("---------------------------------------------- boman-admin 模块启动成功----------------------------------------------");
+        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
+        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
+        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
+        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
+        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
+        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
         System.out.println();
         System.out.println();
     }

+ 2 - 2
boman-admin/src/main/resources/bootstrap-prod.yml → boman-report/src/main/resources/bootstrap-prod.yml

@@ -1,9 +1,9 @@
 server:
-  port: 1234
+  port: 12345
 
 spring:
   application:
-    name: boman-admin
+    name: boman-report
   profiles:
     active: prod
   cloud:

+ 1 - 1
boman-admin/src/main/resources/bootstrap.yml → boman-report/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ server:
 
 spring: 
   application:
-    name: boman-admin
+    name: boman-report
   profiles:
     active: jiaoyu
   cloud:

+ 5 - 5
boman-admin/src/main/resources/logback.xml → boman-report/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/boman-admin" />
+	<property name="log.path" value="logs/boman-report" />
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -13,7 +13,7 @@
 	</appender>
 
     <!-- 系统日志输出 -->
-	<appender name="admin_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	<appender name="report_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/info.log</file>
         <!-- 循环政策:基于时间创建日志文件 -->
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -35,7 +35,7 @@
         </filter>
 	</appender>
 
-    <appender name="admin_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="report_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/error.log</file>
         <!-- 循环政策:基于时间创建日志文件 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -68,7 +68,7 @@
 	
 	<!--系统操作日志-->
     <root level="info">
-        <appender-ref ref="admin_info" />
-        <appender-ref ref="admin_error" />
+        <appender-ref ref="report_info" />
+        <appender-ref ref="report_error" />
     </root>
 </configuration>

+ 1 - 1
pom.xml

@@ -232,7 +232,7 @@
 		<module>boman-common</module>
 		<module>boman-web-core</module>
         <module>boman-wechat</module>
-        <module>jiaoyuju-admin</module>
+        <module>boman-report</module>
     </modules>
     <packaging>pom</packaging>
 

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.