diff --git a/blade-service/blade-openapi/src/main/resources/openapi-lock.yaml b/blade-service/blade-openapi/src/main/resources/openapi-lock.yaml index c67d709..e388d4f 100644 --- a/blade-service/blade-openapi/src/main/resources/openapi-lock.yaml +++ b/blade-service/blade-openapi/src/main/resources/openapi-lock.yaml @@ -1,5 +1,9 @@ # openapi 当前处理人刷新依赖 Redisson 分布式锁。 # 该文件必须在 nacos blade-*.yaml 之后导入,用于覆盖全局 blade.lock.enabled=false。 +# 连接信息与业务 Redis 保持一致,避免 Redisson 因缺少密码出现 NOAUTH。 blade: lock: enabled: true + address: redis://${spring.data.redis.host:127.0.0.1}:${spring.data.redis.port:6379} + password: ${spring.data.redis.password:} + database: ${spring.data.redis.database:0} diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CustomerArchivePublicController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CustomerArchivePublicController.java index b2094c3..8db8987 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CustomerArchivePublicController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CustomerArchivePublicController.java @@ -22,12 +22,14 @@ */ package org.springblade.transport.controller; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.annotation.PreAuth; @@ -38,15 +40,20 @@ import org.springblade.transport.pojo.vo.CustomerArchiveVO; import org.springblade.transport.pojo.vo.CustomerChangeRecordVO; import org.springblade.transport.service.ICustomerArchiveService; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + /** * 客商档案公开查看 控制器 * * @author Chill */ +@Slf4j @RestController @AllArgsConstructor @TenantIgnore @@ -78,4 +85,15 @@ public class CustomerArchivePublicController { return R.data(customerArchiveService.publicChangeRecordPage(Condition.getPage(query), customerId)); } + /** + * 公开接收流程页 postMessage 数据(当前仅打印,便于联调) + */ + @PostMapping("/process-message") + @ApiOperationSupport(order = 3) + @Operation(summary = "公开接收流程消息", description = "无需登录,当前仅打印接收数据") + public R processMessage(@RequestBody Map body) { + log.info("客商公开页收到流程消息:{}", JSON.toJSONString(body)); + return R.success("ok"); + } + } diff --git a/doc/nacos/blade-prod.yaml b/doc/nacos/blade-prod.yaml index 407b09c..384f904 100644 --- a/doc/nacos/blade-prod.yaml +++ b/doc/nacos/blade-prod.yaml @@ -39,6 +39,7 @@ blade: ##将docker脚本部署的redis服务映射为宿主机ip ##生产环境推荐使用阿里云高可用redis服务并设置密码 address: redis://172.16.203.228:6379 + password: ${spring.data.redis.password:} #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: prod: