Merge branch '升级分支'

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

@@ -4,6 +4,16 @@ MAINTAINER jeecgos@163.com
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
+# 解决linuxkit 精简镜像对 locale 裁剪导致中文乱码问题 java:17-anolis基于anolis（CentOS/RHEL 系）应当使用yum
+RUN yum install -y --setopt=tsflags=nodocs \
+        glibc-langpack-en \
+        glibc-common \
+    && yum clean all
+
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
+ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
+
 #RUN mkdir -p /jeecg-boot/config/jeecg/
 
 WORKDIR /jeecg-boot
@@ -11,8 +21,9 @@ WORKDIR /jeecg-boot
 EXPOSE 8080
 
 #ADD ./src/main/resources/jeecg ./config/jeecg
-ADD ./target/jeecg-system-start-3.9.1.jar ./
+ADD ./target/jeecg-system-start-3.9.2.jar ./
 
 RUN mkdir -p /jeecg-boot/config
 
-CMD sleep 60;java -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.9.1.jar
+# 【PR#9345】编码已通过JAVA_TOOL_OPTIONS设置，CMD改用&&和exec
+CMD sleep 60 && exec java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.9.2.jar

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-module-system</artifactId>
         <groupId>org.jeecgframework.boot3</groupId>
-        <version>3.9.1</version>
+        <version>3.9.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,19 +24,16 @@
             <artifactId>jeecg-module-demo</artifactId>
             <version>${jeecgboot.version}</version>
         </dependency>
-        <!-- 打印模板（Hiprint） -->
         <dependency>
             <groupId>org.jeecgframework.boot3</groupId>
             <artifactId>jeecg-module-print</artifactId>
             <version>${jeecgboot.version}</version>
         </dependency>
-        <!-- MES XSL 业务模块 -->
         <dependency>
             <groupId>org.jeecgframework.boot3</groupId>
             <artifactId>jeecg-module-xslmes</artifactId>
             <version>${jeecgboot.version}</version>
         </dependency>
-        <!-- 设备断联续传同步模块 -->
         <dependency>
             <groupId>org.jeecgframework.boot3</groupId>
             <artifactId>jeecg-module-device-sync</artifactId>
@@ -64,7 +61,7 @@
      <!--  <dependency>
            <groupId>org.jeecgframework.boot3</groupId>
            <artifactId>jeecg-cloud-test-shardingsphere</artifactId>
-           <version>3.9.1</version>
+           <version>3.9.2</version>
        </dependency>-->
     </dependencies>
 

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/config/flyway/FlywayConfig.java

@@ -8,8 +8,8 @@ import org.flywaydb.core.api.FlywayException;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.Environment;
 
 import javax.sql.DataSource;
@@ -22,6 +22,7 @@ import java.util.Map;
  * @date: 2024/3/12 10:03
  */
 @Slf4j
+@Lazy(false)
 @Configuration
 public class FlywayConfig {
 

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt

@@ -9,7 +9,7 @@ ${AnsiColor.BRIGHT_BLUE}
 
 
 ${AnsiColor.BRIGHT_GREEN}
-Jeecg  Boot Version: 3.9.1
+Jeecg  Boot Version: 3.9.2
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
 产品官网： www.jeecg.com
 版权所属： 北京国炬信息技术有限公司