Merge remote-tracking branch 'refs/remotes/ztcloud/test' into dev

pom.xml

@@ -204,7 +204,7 @@
         <repository>
             <id>ZT</id>
             <name>中铜 ZStack 私服</name>
-            <url>http://172.16.46.63:30708/repository/test/</url>
+            <url>http://172.16.46.63:30708/repository/zt-cloud/</url>
             <releases>
                 <updatePolicy>always</updatePolicy>
                 <checksumPolicy>warn</checksumPolicy>
@@ -222,11 +222,11 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
         </repository>
-<!--    <snapshotRepository>-->
+        <snapshotRepository>
-<!--        <id>ZT</id>-->
+            <id>ZT-snap</id>
-<!--        <name>中铜 ZStack 私服</name>-->
+            <name>中铜 ZStack 私服</name>
-<!--        <url>https://your-nexus.example.com/repository/maven-snapshots/</url>-->
+            <url>http://172.16.46.63:30708/repository/test-snap/</url>
-<!--    </snapshotRepository>-->
+        </snapshotRepository>
     </distributionManagement>
 
     <profiles>

sql/dm/databus_api_credential_enable_encryption_20260114.sql

@@ -0,0 +1,7 @@
+-- 为 API 客户端凭证表添加"是否启用加密"字段
+-- 2026-01-14
+
+ALTER TABLE databus_api_client_credential
+    ADD enable_encryption BIT DEFAULT '1' NOT NULL;
+
+COMMENT ON COLUMN databus_api_client_credential.enable_encryption IS '是否启用加密传输';

sql/dm/ruoyi-vue-pro-dm8.sql

@@ -339,7 +339,8 @@ CREATE TABLE infra_file (
                             create_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL,
                             updater varchar(64) DEFAULT '' NULL,
                             update_time datetime DEFAULT CURRENT_TIMESTAMP NOT NULL,
-                            deleted bit DEFAULT '0' NOT NULL
+                            deleted bit DEFAULT '0' NOT NULL,
+                            DOWNLOAD_COUNT INT DEFAULT 0 NOT NULL
 );
 
 COMMENT ON COLUMN infra_file.id IS '文件编号';
@@ -356,6 +357,7 @@ COMMENT ON COLUMN infra_file.create_time IS '创建时间';
 COMMENT ON COLUMN infra_file.updater IS '更新者';
 COMMENT ON COLUMN infra_file.update_time IS '更新时间';
 COMMENT ON COLUMN infra_file.deleted IS '是否删除';
+COMMENT ON COLUMN INFRA_FILE.DOWNLOAD_COUNT IS '下载次数';
 COMMENT ON TABLE infra_file IS '文件表';
 
 CREATE INDEX idx_infra_file_hash ON infra_file(hash);

sql/dm/添加文件下载次数统计字段.sql

@@ -0,0 +1,5 @@
+-- 添加文件下载次数统计字段
+ALTER TABLE JYGK_TEST.INFRA_FILE
+    ADD DOWNLOAD_COUNT INT DEFAULT 0 NOT NULL;
+
+COMMENT ON COLUMN JYGK_TEST.INFRA_FILE.DOWNLOAD_COUNT IS '下载次数';

zt-dependencies/pom.xml

@@ -10,11 +10,11 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
         </repository>
-        <!--    <snapshotRepository>-->
+        <snapshotRepository>
-        <!--        <id>ZT</id>-->
+            <id>ZT-snap</id>
-        <!--        <name>中铜 ZStack 私服</name>-->
+            <name>中铜 ZStack 私服</name>
-        <!--        <url>https://your-nexus.example.com/repository/maven-snapshots/</url>-->
+            <url>http://172.16.46.63:30708/repository/test-snap/</url>
-        <!--    </snapshotRepository>-->
+        </snapshotRepository>
     </distributionManagement>
     <groupId>com.zt.plat</groupId>
     <artifactId>zt-dependencies</artifactId>

zt-framework/pom.xml

@@ -25,7 +25,7 @@
         <module>zt-spring-boot-starter-job</module>
         <module>zt-spring-boot-starter-mq</module>
         <module>zt-spring-boot-starter-rpc</module>
-
+        <module>zt-spring-boot-starter-seata-dm</module>
         <module>zt-spring-boot-starter-excel</module>
         <module>zt-spring-boot-starter-test</module>
 

zt-module-databus/zt-module-databus-server-app/Dockerfile

@@ -0,0 +1,19 @@
+## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性
+
+FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre
+
+## 创建目录，并使用它作为工作目录
+RUN mkdir -p /zt-module-databus-server-app
+WORKDIR /zt-module-databus-server-app
+## 将后端项目的 Jar 文件，复制到镜像中
+COPY ./target/zt-module-databus-server-app.jar app.jar
+
+## 设置 TZ 时区
+## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx1024m"
+
+## 暴露后端项目的 48080 端口
+EXPOSE 48082
+
+## 启动后端项目
+CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/controller/admin/gateway/vo/credential/ApiClientCredentialRespVO.java

@@ -42,6 +42,9 @@ public class ApiClientCredentialRespVO {
     @Schema(description = "匿名访问固定用户昵称", example = "张三")
     private String anonymousUserNickname;
 
+    @Schema(description = "是否启用加密", example = "true")
+    private Boolean enableEncryption;
+
     @Schema(description = "创建时间")
     private LocalDateTime createTime;
 

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/controller/admin/gateway/vo/credential/ApiClientCredentialSaveReqVO.java

@@ -45,4 +45,8 @@ public class ApiClientCredentialSaveReqVO {
     @Schema(description = "匿名访问固定用户 ID", example = "1024")
     private Long anonymousUserId;
 
+    @Schema(description = "是否启用加密", example = "true")
+    @NotNull(message = "启用加密标识不能为空")
+    private Boolean enableEncryption;
+
 }

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/dal/dataobject/gateway/ApiClientCredentialDO.java

@@ -38,4 +38,6 @@ public class ApiClientCredentialDO extends BaseDO {
 
     private Long anonymousUserId;
 
+    private Boolean enableEncryption;
+
 }