Merge branch 'dev' into test

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/controller/admin/gateway/ApiClientCredentialController.java

@@ -8,6 +8,7 @@ import com.zt.plat.module.databus.controller.admin.gateway.vo.credential.ApiClie
 import com.zt.plat.module.databus.controller.admin.gateway.vo.credential.ApiClientCredentialSaveReqVO;
 import com.zt.plat.module.databus.controller.admin.gateway.vo.credential.ApiClientCredentialSimpleRespVO;
 import com.zt.plat.module.databus.dal.dataobject.gateway.ApiClientCredentialDO;
+import com.zt.plat.module.databus.service.gateway.ApiAnonymousUserService;
 import com.zt.plat.module.databus.service.gateway.ApiClientCredentialService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
+import static org.springframework.util.CollectionUtils.isEmpty;
 
 @Tag(name = "管理后台 - API 客户端凭证")
 @RestController
@@ -35,19 +37,24 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 public class ApiClientCredentialController {
 
     private final ApiClientCredentialService credentialService;
+    private final ApiAnonymousUserService anonymousUserService;
 
     @GetMapping("/page")
     @Operation(summary = "分页查询客户端凭证")
     public CommonResult<PageResult<ApiClientCredentialRespVO>> page(ApiClientCredentialPageReqVO reqVO) {
         PageResult<ApiClientCredentialDO> page = credentialService.getPage(reqVO);
-        return success(ApiClientCredentialConvert.INSTANCE.convertPage(page));
+        PageResult<ApiClientCredentialRespVO> respPage = ApiClientCredentialConvert.INSTANCE.convertPage(page);
+        populateAnonymousInfo(respPage.getList());
+        return success(respPage);
     }
 
     @GetMapping("/get")
     @Operation(summary = "查询凭证详情")
     public CommonResult<ApiClientCredentialRespVO> get(@RequestParam("id") Long id) {
         ApiClientCredentialDO credential = credentialService.get(id);
-        return success(ApiClientCredentialConvert.INSTANCE.convert(credential));
+        ApiClientCredentialRespVO respVO = ApiClientCredentialConvert.INSTANCE.convert(credential);
+        populateAnonymousInfo(List.of(respVO));
+        return success(respVO);
     }
 
     @PostMapping("/create")
@@ -76,4 +83,14 @@ public class ApiClientCredentialController {
         List<ApiClientCredentialDO> list = credentialService.listEnabled();
         return success(ApiClientCredentialConvert.INSTANCE.convertSimpleList(list));
     }
+
+    private void populateAnonymousInfo(List<ApiClientCredentialRespVO> list) {
+        if (isEmpty(list)) {
+            return;
+        }
+        list.stream()
+                .filter(item -> Boolean.TRUE.equals(item.getAllowAnonymous()) && item.getAnonymousUserId() != null)
+                .forEach(item -> anonymousUserService.find(item.getAnonymousUserId())
+                        .ifPresent(details -> item.setAnonymousUserNickname(details.getNickname())));
+    }
 }

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/controller/admin/gateway/ApiGatewayController.java

@@ -5,6 +5,7 @@ import com.zt.plat.module.databus.controller.admin.gateway.convert.ApiDefinition
 import com.zt.plat.module.databus.controller.admin.gateway.vo.ApiGatewayInvokeReqVO;
 import com.zt.plat.module.databus.controller.admin.gateway.vo.definition.ApiDefinitionDetailRespVO;
 import com.zt.plat.module.databus.framework.integration.gateway.core.ApiGatewayExecutionService;
+import com.zt.plat.module.databus.framework.integration.gateway.core.IntegrationFlowManager;
 import com.zt.plat.module.databus.framework.integration.gateway.model.ApiGatewayResponse;
 import com.zt.plat.module.databus.service.gateway.ApiDefinitionService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,6 +28,7 @@ public class ApiGatewayController {
 
     private final ApiGatewayExecutionService executionService;
     private final ApiDefinitionService apiDefinitionService;
+    private final IntegrationFlowManager integrationFlowManager;
 
     @PostMapping(value = "/invoke", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "测试调用 API 编排")
@@ -43,4 +45,12 @@ public class ApiGatewayController {
         return success(definitions);
     }
 
+    @PostMapping("/cache/refresh")
+    @Operation(summary = "刷新 API 缓存")
+    public CommonResult<Boolean> refreshCache() {
+        apiDefinitionService.refreshAllCache();
+        integrationFlowManager.refreshAll();
+        return success(Boolean.TRUE);
+    }
+
 }

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

@@ -33,6 +33,15 @@ public class ApiClientCredentialRespVO {
     @Schema(description = "备注", example = "默认应用凭证")
     private String remark;
 
+    @Schema(description = "允许匿名访问", example = "false")
+    private Boolean allowAnonymous;
+
+    @Schema(description = "匿名访问固定用户 ID", example = "1024")
+    private Long anonymousUserId;
+
+    @Schema(description = "匿名访问固定用户昵称", example = "张三")
+    private String anonymousUserNickname;
+
     @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

@@ -38,4 +38,11 @@ public class ApiClientCredentialSaveReqVO {
     @Schema(description = "备注", example = "默认应用凭证")
     private String remark;
 
+    @Schema(description = "允许匿名访问", example = "false")
+    @NotNull(message = "匿名访问标识不能为空")
+    private Boolean allowAnonymous;
+
+    @Schema(description = "匿名访问固定用户 ID", example = "1024")
+    private Long anonymousUserId;
+
 }

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

@@ -34,4 +34,8 @@ public class ApiClientCredentialDO extends BaseDO {
 
     private String remark;
 
+    private Boolean allowAnonymous;
+
+    private Long anonymousUserId;
+
 }

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/integration/config/ApiGatewayProperties.java

@@ -17,6 +17,10 @@ import java.util.Set;
 @ConfigurationProperties(prefix = "databus.api-portal")
 public class ApiGatewayProperties {
 
+    public static String APP_ID_HEADER = "ZT-App-Id";
+    public static String TIMESTAMP_HEADER = "ZT-Timestamp";
+    public static String NONCE_HEADER = "ZT-Nonce";
+    public static String SIGNATURE_HEADER = "ZT-Signature";
     public static final String DEFAULT_BASE_PATH = "/admin-api/databus/api/portal";
     public static final String LEGACY_BASE_PATH = "/databus/api/portal";
 
@@ -62,14 +66,6 @@ public class ApiGatewayProperties {
 
         private boolean enabled = true;
 
-        private String appIdHeader = "ZT-App-Id";
-
-        private String timestampHeader = "ZT-Timestamp";
-
-        private String nonceHeader = "ZT-Nonce";
-
-        private String signatureHeader = "ZT-Signature";
-
         private String signatureType = CryptoSignatureUtils.SIGNATURE_TYPE_MD5;
 
         private String encryptionType = CryptoSignatureUtils.ENCRYPT_TYPE_AES;

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/integration/gateway/config/GatewayWebClientConfiguration.java

@@ -0,0 +1,24 @@
+package com.zt.plat.module.databus.framework.integration.gateway.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.reactive.function.client.WebClientCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+public class GatewayWebClientConfiguration {
+
+    private final int maxInMemorySize;
+
+    public GatewayWebClientConfiguration(
+            @Value("${databus.gateway.web-client.max-in-memory-size:2097152}") int maxInMemorySize) {
+        this.maxInMemorySize = maxInMemorySize;
+    }
+
+    @Bean
+    public WebClientCustomizer gatewayWebClientCustomizer() {
+        return builder -> builder.codecs(configurer ->
+                configurer.defaultCodecs().maxInMemorySize(maxInMemorySize));
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.zt.plat.module.databus.framework.rpc.config;
+
+import com.zt.plat.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
+import com.zt.plat.module.system.api.user.AdminUserApi;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Databus 模块的 RPC 配置，开启所需的 Feign 客户端。
+ */
+@Configuration(value = "databusRpcConfiguration", proxyBeanMethods = false)
+@EnableFeignClients(clients = {AdminUserApi.class, OAuth2TokenCommonApi.class})
+public class RpcConfiguration {
+}