Merge branch 'dev' into 'test'

修复数据总线访问日志无法显示状态码问题:...

See merge request jygk/dsc!22

zt-module-databus/pom.xml

@@ -11,6 +11,7 @@
         <module>zt-module-databus-api</module>
         <module>zt-module-databus-server</module>
         <module>zt-module-databus-server-app</module>
+        <module>zt-module-databus-client</module>
     </modules>
     <modelVersion>4.0.0</modelVersion>
 

zt-module-databus/zt-module-databus-api/src/main/java/com/zt/plat/module/databus/api/provider/DatabusAccessLogProviderApi.java

@@ -0,0 +1,28 @@
+package com.zt.plat.module.databus.api.provider;
+
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.databus.api.dto.ApiAccessLogCreateReq;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.util.Map;
+
+/**
+ * Databus API访问日志接口
+ * 2026/1/20 16:26
+ */
+@FeignClient(name = "${databus.provider.log.service:databus-server}")
+@Tag(name = "RPC 服务 -  Databus API访问日志接口")
+public interface DatabusAccessLogProviderApi {
+
+    String PREFIX = "/databus/api/portal/access-log";
+
+    @PostMapping(PREFIX + "/add")
+    @Operation(summary = "新增访问日志")
+    CommonResult<Boolean> add(@RequestHeader Map<String, String> headers, @RequestBody ApiAccessLogCreateReq req);
+
+}

zt-module-databus/zt-module-databus-client/pom.xml

@@ -0,0 +1,82 @@
+<?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-databus</artifactId>
+        <groupId>com.zt.plat</groupId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>zt-module-databus-server-client</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+    <description>
+        Databus client, 提供调用第三方服务的能力并记录调用日志。
+    </description>
+
+    <dependencies>
+
+
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-databus-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+
+    </dependencies>
+</project>

zt-module-databus/zt-module-databus-client/src/main/java/com/zt/plat/module/databus/client/RpcConfiguration.java

@@ -0,0 +1,16 @@
+package com.zt.plat.module.databus.client;
+
+/**
+ *
+ * 2026/1/21 10:48
+ */
+
+import com.zt.plat.module.databus.api.provider.DatabusAccessLogProviderApi;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration(proxyBeanMethods = false)
+@EnableFeignClients(clients = {DatabusAccessLogProviderApi.class})
+public class RpcConfiguration {
+
+}

zt-module-databus/zt-module-databus-client/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.zt.plat.module.databus.client.DatabusClient,\
+com.zt.plat.module.databus.client.RpcConfiguration

zt-module-databus/zt-module-databus-client/src/test/java/com/zt/plat/module/databus/DatabusClientTest.java

@@ -0,0 +1,24 @@
+package com.zt.plat.module.databus;
+
+import com.zt.plat.module.databus.client.DatabusClient;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ *
+ * 2026/1/20 14:29
+ */
+@SpringBootTest(classes = TestApplication.class)
+public class DatabusClientTest {
+
+    @Autowired
+    private DatabusClient databusClient;
+
+    @Test
+    void test() {
+        String result = databusClient.get("https://www.baidu.com/", null, null, "jwyw2", "a5d7cf609c0b47038ea405c660726ee9");
+        System.out.println(result);
+    }
+
+}

zt-module-databus/zt-module-databus-client/src/test/java/com/zt/plat/module/databus/TestApplication.java

@@ -0,0 +1,26 @@
+package com.zt.plat.module.databus;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ *
+ * 2026/1/20 14:26
+ */
+@SpringBootTest
+@SpringBootApplication(exclude = {
+        DataSourceAutoConfiguration.class,
+        DataSourceTransactionManagerAutoConfiguration.class,
+        HibernateJpaAutoConfiguration.class,
+        JdbcTemplateAutoConfiguration.class,
+})
+public class TestApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(TestApplication.class, args);
+    }
+}

zt-module-databus/zt-module-databus-client/src/test/resources/application.yaml

@@ -0,0 +1,11 @@
+spring:
+  cloud:
+    nacos:
+      server-addr: 172.16.46.63:30848 # Nacos 服务器地址
+      username: nacos # Nacos 账号
+      password: P@ssword25 # Nacos 密码
+      discovery: # 【配置中心】配置项
+        namespace: klw # 命名空间。这里使用 maven Profile 资源过滤进行动态替换
+        group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
+        metadata:
+          version: 1.0.0 # 服务实例的版本号，可用于灰度发布