Merge branch 'refs/heads/zt-test' into test

# Conflicts:
#	zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/biz/system/permission/PermissionCommonApi.java
#	zt-framework/zt-spring-boot-starter-biz-tenant/src/main/java/com/zt/plat/framework/tenant/core/context/DeptContextHolder.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionServiceImpl.java

zt-module-infra/pom.xml

@@ -11,6 +11,7 @@
     <modules>
         <module>zt-module-infra-api</module>
         <module>zt-module-infra-server</module>
+        <module>zt-module-infra-server-app</module>
     </modules>
     <artifactId>zt-module-infra</artifactId>
     <packaging>pom</packaging>

zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/file/dto/FileRespDTO.java

@@ -34,4 +34,7 @@ public class FileRespDTO {
     @Schema(description = "文件内容", requiredMode = Schema.RequiredMode.REQUIRED)
     private byte[] content;
 
+    @Schema(description = "文件下载次数")
+    private Integer downloadCount;
+
 }

zt-module-infra/zt-module-infra-server-app/Dockerfile

@@ -3,10 +3,10 @@
 FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre
 
 ## 创建目录，并使用它作为工作目录
-RUN mkdir -p /zt-module-infra-server
-WORKDIR /zt-module-infra-server
+RUN mkdir -p /zt-module-infra-server-app
+WORKDIR /zt-module-infra-server-app
 ## 将后端项目的 Jar 文件，复制到镜像中
-COPY ./target/zt-module-infra-server.jar app.jar
+COPY ./target/zt-module-infra-server-app.jar app.jar
 
 ## 设置 TZ 时区
 ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖

zt-module-infra/zt-module-infra-server-app/pom.xml

@@ -0,0 +1,48 @@
+<?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>
+        <artifactId>zt-module-infra</artifactId>
+        <groupId>com.zt.plat</groupId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>zt-module-infra-server-app</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+    <description>
+        infra 模块启动器。
+    </description>
+
+    <dependencies>
+
+
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-infra-server</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+
+    </dependencies>
+    <build>
+        <!-- 设置构建的 jar 包名 -->
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <!-- 打包 -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.boot.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

zt-module-infra/zt-module-infra-server-app/src/main/resources/logback-spring.xml

@@ -88,7 +88,7 @@
         </root>
 
         <!--针对不同的业务路径,配置dao层的sql打印日志级别为DEBUG-->
-        <logger name="com.zt.plat.module.infra.dal.mysql" level="DEBUG" additivity="false">
+        <logger name="com.zt.plat.module.report.dal.mysql" level="DEBUG" additivity="false">
             <appender-ref ref="STDOUT"/>
         </logger>
     </springProfile>

zt-module-infra/zt-module-infra-server/pom.xml

@@ -149,24 +149,5 @@
         </dependency>
 
     </dependencies>
-    <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <!-- 打包 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>