JeecgBoot 2.4.2 积木报表版本发布，基于SpringBoot的低代码平台

jeecg-boot/jeecg-cloud-module/doc/README.md

@@ -1,7 +0,0 @@
-#  服务化改造手册
-
-~~~
-注意 ：启动服务跨域问题处理 
-1、需要将common 模块的 WebMvcConfiguration corsFilter 注掉 后面做成注解切换
-2、org.jeecg.config.shiro.filters.JwtFilter类的 65行，跨域代码注释掉
-~~~

jeecg-boot/jeecg-cloud-module/docker-compose.yml

@@ -0,0 +1,70 @@
+version: '2'
+services:
+  jeecg-boot-mysql:
+    build:
+      context: ../db
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_ROOT_HOST: '%'
+      TZ: Asia/Shanghai
+    restart: always
+    container_name: jeecg-boot-mysql
+    command:
+      --character-set-server=utf8mb4
+      --collation-server=utf8mb4_general_ci
+      --explicit_defaults_for_timestamp=true
+      --lower_case_table_names=1
+      --max_allowed_packet=128M
+      --default-authentication-plugin=caching_sha2_password
+    ports:
+      - 3306:3306
+
+  jeecg-boot-redis:
+    image: redis:5.0
+    ports:
+      - 6379:6379
+    restart: always
+    container_name: jeecg-boot-redis
+    hostname: jeecg-boot-redis
+  jeecg-boot-rabbitmq:
+    #    image: rabbitmq:3-management
+    image: rabbitmq:3
+    ports:
+      - 5672:5672
+    #      - 15672:15672
+    restart: always
+    container_name: jeecg-boot-rabbitmq
+    hostname: jeecg-boot-rabbitmq
+
+  jeecg-boot-nacos:
+    restart: always
+    image: nacos/nacos-server
+    container_name: jeecg-boot-nacos
+    hostname: jeecg-boot-nacos
+    ports:
+      - 8848:8848
+    environment:
+      MODE: standalone
+
+  jeecg-boot-gateway:
+    build:
+      context: ./jeecg-cloud-gateway
+    ports:
+      - 9999:9999
+    container_name: jeecg-boot-gateway
+    hostname: jeecg-boot-gateway
+
+  jeecg-boot-system:
+    depends_on:
+      - jeecg-boot-mysql
+      - jeecg-boot-redis
+      - jeecg-boot-nacos
+    build:
+      context: ./jeecg-cloud-system-start
+    container_name: jeecg-boot-system
+    hostname: jeecg-boot-system
+    restart: on-failure
+    environment:
+      - TZ=Asia/Shanghai
+
+

jeecg-boot/jeecg-cloud-module/jeecg-cloud-demo/Dockerfile

@@ -0,0 +1,16 @@
+FROM anapsix/alpine-java:8_server-jre_unlimited
+
+MAINTAINER jeecgos@163.com
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+RUN mkdir -p /jeecg-cloud-demo
+
+WORKDIR /jeecg-cloud-demo
+
+EXPOSE 7001
+
+ADD ./target/jeecg-cloud-demo-2.4.2.jar ./
+
+CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-demo-2.4.2.jar
+

jeecg-boot/jeecg-cloud-module/jeecg-cloud-demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>2.4.0</version>
+        <version>2.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-cloud-demo</artifactId>

jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>2.4.0</version>
+        <version>2.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java

@@ -86,9 +86,6 @@ public class DynamicRouteLoader implements ApplicationEventPublisherAware {
         String dataType = GatewayRoutersConfiguration.DATA_TYPE;
         if (!RouterDataType.yml.toString().endsWith(dataType)) {
             this.init();
-            // 触发默认路由刷新事件,刷新缓存路由
-            this.publisher.publishEvent(new RefreshRoutesEvent(this));
-            log.info("路由已刷新..............");
         }
         return Mono.empty();
     }
@@ -135,7 +132,7 @@ public class DynamicRouteLoader implements ApplicationEventPublisherAware {
         if (configService == null) {
             log.warn("initConfigService fail");
         }
-        String configInfo = redisClient.get("geteway_routes");
+        String configInfo = redisClient.get("gateway_routes");
         if (StringUtils.isNotBlank(configInfo)) {
             log.info("获取网关当前配置:\r\n{}", configInfo);
             JSONArray array = JSON.parseArray(configInfo);

jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
         - id: jeecg-system
           uri: lb://jeecg-system
           predicates:
-            - Path=/sys/**,/eoa/**,/joa/**,/online/**,/bigscreen/**,/jmreport/**,/desform/**,/act/**,/plug-in/**,/generic/**,/druid/**
+            - Path=/sys/**,/eoa/**,/v1/**,/joa/**,/online/**,/bigscreen/**,/jmreport/**,/desform/**,/act/**,/plug-in/**,/generic/**
         - id: jeecg-system-websocket
           uri: lb:ws://jeecg-system
           predicates:

jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/logback-spring.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false">
-	<!--定义日志文件的存储地址 -->
-	<property name="LOG_HOME" value="../logs" />
-
-	<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
-	<!-- 控制台输出 -->
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>-->
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<!-- 按照每天生成日志文件 -->
-	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<!--日志文件输出的文件名 -->
-			<FileNamePattern>${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-			<!--日志文件保留天数 -->
-			<MaxHistory>30</MaxHistory>
-			<maxFileSize>10MB</maxFileSize>
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<!-- 生成 error html格式日志开始 -->
-	<appender name="HTML" class="ch.qos.logback.core.FileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<!--设置日志级别,过滤掉info日志,只输入error日志-->
-			<level>ERROR</level>
-		</filter>
-		<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-			<layout class="ch.qos.logback.classic.html.HTMLLayout">
-				<pattern>%p%d%msg%M%F{32}%L</pattern>
-			</layout>
-		</encoder>
-		<file>${LOG_HOME}/error-log.html</file>
-	</appender>
-	<!-- 生成 error html格式日志结束 -->
-
-	<!--myibatis log configure -->
-	<logger name="com.apache.ibatis" level="TRACE" />
-	<logger name="java.sql.Connection" level="DEBUG" />
-	<logger name="java.sql.Statement" level="DEBUG" />
-	<logger name="java.sql.PreparedStatement" level="DEBUG" />
-
-	<!-- 日志输出级别 -->
-	<root level="INFO">
-		<appender-ref ref="STDOUT" />
-		<appender-ref ref="FILE" />
-		<appender-ref ref="HTML" />
-	</root>
-
-</configuration>

jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>2.4.0</version>
+        <version>2.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-cloud-monitor</artifactId>

jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/src/main/resources/application.yml

@@ -1,8 +1,6 @@
 server:
   port: 9111
 spring:
-  main:
-    allow-bean-definition-overriding: true
   boot:
     admin:
       ui:

jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/Dockerfile

@@ -0,0 +1,16 @@
+FROM anapsix/alpine-java:8_server-jre_unlimited
+
+MAINTAINER jeecgos@163.com
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+RUN mkdir -p /jeecg-cloud-system
+
+WORKDIR /jeecg-cloud-system
+
+EXPOSE 7001
+
+ADD ./target/jeecg-cloud-system-start-2.4.2.jar ./
+
+CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-system-start-2.4.2.jar
+

jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>2.4.0</version>
+        <version>2.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-cloud-system-start</artifactId>
@@ -29,16 +29,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!--rabbitmq消息队列-->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-starter-rabbitmq</artifactId>
+        </dependency>
         <!--xxl-job定时任务-->
         <dependency>
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-starter-job</artifactId>
         </dependency>
-        <!--rabbitmq消息队列
-       <dependency>
-           <groupId>org.jeecgframework.boot</groupId>
-           <artifactId>jeecg-boot-starter-rabbitmq</artifactId>
-       </dependency>-->
     </dependencies>
 
     <build>

jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-cloud-module</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>2.4.0</version>
+        <version>2.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jeecg-boot/jeecg-cloud-module/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-boot-parent</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>2.4.0</version>
+        <version>2.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>