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

# Conflicts:
#	zt-module-infra/zt-module-infra-server/src/main/resources/application.yaml

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

@@ -185,6 +185,11 @@
             <version>4.12.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-spring-boot-starter-databus-client</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 
     <build>

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/integration/gateway/security/GatewaySecurityFilter.java

@@ -33,6 +33,7 @@ import org.springframework.web.util.ContentCachingResponseWrapper;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.io.IOException;
+import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -304,15 +305,28 @@ public class GatewaySecurityFilter extends OncePerRequestFilter {
                     .build()
                     .getQueryParams();
             params.forEach((key, values) -> {
-                if (!StringUtils.hasText(key) || "signature".equalsIgnoreCase(key)) {
+                String decodedKey = URLDecoder.decode(key, StandardCharsets.UTF_8);
+                if (!StringUtils.hasText(decodedKey) || "signature".equalsIgnoreCase(decodedKey)) {
                     return;
                 }
                 if (CollectionUtils.isEmpty(values)) {
-                    target.put(key, "");
-                } else if (values.size() == 1) {
-                    target.put(key, values.get(0));
+                    target.put(decodedKey, "");
+                    return;
+                }
+                // 对每一个 value 做 URL 解码，确保与客户端原文签名一致
+                List<String> decodedValues = values.stream()
+                        .map(val -> URLDecoder.decode(val, StandardCharsets.UTF_8))
+                        .toList();
+                boolean allNullLiteral = decodedValues.stream()
+                        .allMatch(v -> "null".equals(v));
+                if (allNullLiteral) {
+                    // 过滤掉仅包含字符串 "null" 的参数
+                    return;
+                }
+                if (decodedValues.size() == 1) {
+                    target.put(decodedKey, decodedValues.get(0));
                 } else {
-                    target.put(key, String.join(",", values));
+                    target.put(decodedKey, String.join(",", decodedValues));
                 }
             });
         } catch (IllegalArgumentException ex) {

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/rpc/config/RpcConfiguration.java

@@ -4,9 +4,13 @@ import com.zt.plat.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
 import com.zt.plat.module.databus.api.provider.DatabusDeptProviderApi;
 import com.zt.plat.module.databus.api.provider.DatabusPostProviderApi;
 import com.zt.plat.module.databus.api.provider.DatabusUserProviderApi;
+import com.zt.plat.module.databus.api.provider.DatabusUserDeptProviderApi;
+import com.zt.plat.module.databus.api.provider.DatabusUserPostProviderApi;
 import com.zt.plat.module.system.api.dept.DeptApi;
 import com.zt.plat.module.system.api.dept.PostApi;
 import com.zt.plat.module.system.api.user.AdminUserApi;
+import com.zt.plat.module.system.api.userdept.UserDeptApi;
+import com.zt.plat.module.system.api.userpost.UserPostApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
@@ -21,9 +25,12 @@ import org.springframework.context.annotation.Configuration;
     DatabusDeptProviderApi.class,
     DatabusUserProviderApi.class,
     DatabusPostProviderApi.class,
-        PostApi.class,
-        DeptApi.class,
-        AdminUserApi.class,
+    DatabusUserDeptProviderApi.class,
+    DatabusUserPostProviderApi.class,
+    PostApi.class,
+    DeptApi.class,
+        UserDeptApi.class,
+        UserPostApi.class,
 })
 public class RpcConfiguration {
 }