feat: 入站 notify 对接完成(ping/reply + 入站签名算法)
- 新增 notify/PingHandler.php(notify.ping 连通性测试) - 新增 notify/ReplyHandler.php(notify.reply 消息回复,Redis 幂等 + 推送到 IM) - Dispatcher 自动注册内置处理器,入站签名改为 MD5(secret+timestamp+bodyJson) - WmsSign 新增 getAppSecret() 供验签使用 - ReplyHandler 通过 ext_data.source 判断消息来源(wx/qiwe)
This commit is contained in:
parent
3d566595e0
commit
c00708f58c
@ -33,6 +33,15 @@ class WmsSign
|
||||
$this->appSecret = $appSecret;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取 appSecret(供外部验签使用)
|
||||
* @return string
|
||||
*/
|
||||
public function getAppSecret()
|
||||
{
|
||||
return $this->appSecret;
|
||||
}
|
||||
|
||||
// ==================== 公开方法 ====================
|
||||
|
||||
/**
|
||||
|
||||
@ -94,6 +94,33 @@ class WmsVerify
|
||||
|
||||
// ==================== 内部方法 ====================
|
||||
|
||||
// ==================== 入站通知专用验签 ====================
|
||||
|
||||
/**
|
||||
* 验证入站通知签名(算法不同:MD5(secret + timestamp + bodyJson))
|
||||
*
|
||||
* @param array $queryParams URL query 参数(含 sign / timestamp)
|
||||
* @param string $rawBody 原始请求体字符串
|
||||
* @return bool
|
||||
*/
|
||||
public function verifyNotify(array $queryParams, $rawBody)
|
||||
{
|
||||
$incomingSign = isset($queryParams['sign']) ? $queryParams['sign'] : '';
|
||||
$timestamp = isset($queryParams['timestamp']) ? $queryParams['timestamp'] : 0;
|
||||
|
||||
if (empty($incomingSign) || empty($timestamp)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 入站签名: MD5(secret + timestamp + bodyJson)
|
||||
$signText = $this->signer->getAppSecret() . $timestamp . $rawBody;
|
||||
$expectedSign = md5($signText);
|
||||
|
||||
return $this->hashEquals($expectedSign, $incomingSign);
|
||||
}
|
||||
|
||||
// ==================== 内部方法 ====================
|
||||
|
||||
/**
|
||||
* 恒定时间字符串比较(防止时序攻击)
|
||||
*
|
||||
|
||||
@ -47,6 +47,14 @@ class Dispatcher
|
||||
{
|
||||
$appSecret = config('wms.app_secret') ?: '';
|
||||
$this->verifier = new WmsVerify($appSecret);
|
||||
|
||||
// 注册内置处理器
|
||||
if (!isset(self::$handlers['notify.ping'])) {
|
||||
self::register('notify.ping', [new PingHandler(), 'handle']);
|
||||
}
|
||||
if (!isset(self::$handlers['notify.reply'])) {
|
||||
self::register('notify.reply', [new ReplyHandler(), 'handle']);
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== 处理器注册 ====================
|
||||
@ -103,8 +111,8 @@ class Dispatcher
|
||||
}
|
||||
}
|
||||
|
||||
// ---- 2. 验签 ----
|
||||
if (!$this->verifier->verify($queryParams, $body)) {
|
||||
// ---- 2. 验签(入站算法:MD5(secret + timestamp + bodyJson))----
|
||||
if (!$this->verifier->verifyNotify($queryParams, $rawBody)) {
|
||||
\think\Log::error('[WmsNotify] 验签失败: ' . json_encode([
|
||||
'query' => $queryParams,
|
||||
'body' => $rawBody,
|
||||
|
||||
24
application/index/library/new_wms/notify/PingHandler.php
Normal file
24
application/index/library/new_wms/notify/PingHandler.php
Normal file
@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
namespace app\index\library\new_wms\notify;
|
||||
|
||||
/**
|
||||
* notify.ping — 连通性测试
|
||||
*
|
||||
* WMS 配置 notify_url 后发送 ping 验证外部系统可达。
|
||||
* 返回 {"code":200} 即可。
|
||||
*/
|
||||
class PingHandler
|
||||
{
|
||||
/**
|
||||
* 处理 ping 通知
|
||||
*
|
||||
* @param array $body 请求体
|
||||
* @param array $query URL query 参数
|
||||
* @return array
|
||||
*/
|
||||
public function handle(array $body, array $query)
|
||||
{
|
||||
return ['code' => 200, 'msg' => 'ok', 'data' => null];
|
||||
}
|
||||
}
|
||||
92
application/index/library/new_wms/notify/ReplyHandler.php
Normal file
92
application/index/library/new_wms/notify/ReplyHandler.php
Normal file
@ -0,0 +1,92 @@
|
||||
<?php
|
||||
|
||||
namespace app\index\library\new_wms\notify;
|
||||
|
||||
/**
|
||||
* notify.reply — 消息回复通知
|
||||
*
|
||||
* WMS 处理入站消息后,将 AI 回复/绑群结果/面单余额推送到外部系统。
|
||||
* 根据 data.type 区分:ai / bind / balance / error
|
||||
*
|
||||
* 回复消息通过 Redis 队列发送到对应的 IM 群聊。
|
||||
*/
|
||||
class ReplyHandler
|
||||
{
|
||||
/**
|
||||
* 处理 reply 通知
|
||||
*
|
||||
* @param array $body 请求体 { code, data: { type, content, ext_id, group_id, user_id, ... } }
|
||||
* @param array $query URL query 参数
|
||||
* @return array
|
||||
*/
|
||||
public function handle(array $body, array $query)
|
||||
{
|
||||
$data = $body['data'] ?? [];
|
||||
|
||||
$type = $data['type'] ?? '';
|
||||
$content = $data['content'] ?? '';
|
||||
$extId = $data['ext_id'] ?? '';
|
||||
$groupId = $data['group_id'] ?? '';
|
||||
$userId = $data['user_id'] ?? '';
|
||||
$groupName = $data['group_name'] ?? '';
|
||||
$userName = $data['user_name'] ?? '';
|
||||
$extData = $data['ext_data'] ?? null;
|
||||
|
||||
\think\Log::error("[WmsNotify] reply 入站: type={$type} ext_id={$extId} group={$groupId} user={$userId} content={$content}");
|
||||
|
||||
// ---- 幂等去重 ----
|
||||
if ($extId) {
|
||||
try {
|
||||
$redis = new \Redis();
|
||||
$redis->connect('127.0.0.1', 6379);
|
||||
$redis->auth('qwe2019@');
|
||||
$redis->select(3);
|
||||
$dedupeKey = "wms_reply:{$extId}";
|
||||
if ($redis->exists($dedupeKey)) {
|
||||
\think\Log::info("[WmsNotify] reply 重复推送已忽略: ext_id={$extId}");
|
||||
return ['code' => 200, 'msg' => 'duplicate', 'data' => null];
|
||||
}
|
||||
$redis->setex($dedupeKey, 3600, 1);
|
||||
} catch (\Exception $e) {
|
||||
// Redis 不可用时跳过去重,不阻塞
|
||||
}
|
||||
}
|
||||
|
||||
// ---- 根据 ext_data.source 判断消息来源,发送回复 ----
|
||||
if ($groupId && $content) {
|
||||
$source = is_array($extData) ? ($extData['source'] ?? 'wx') : 'wx';
|
||||
$this->sendToGroup($groupId, $content, $userId, $source);
|
||||
}
|
||||
|
||||
return ['code' => 200, 'msg' => 'ok', 'data' => null];
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送回复消息到 IM 群
|
||||
*/
|
||||
private function sendToGroup($groupId, $content, $userId, $source)
|
||||
{
|
||||
try {
|
||||
$msg = [
|
||||
'method' => 'sendText',
|
||||
'wxid' => $groupId,
|
||||
'msg' => $content,
|
||||
'atid' => $userId ?: '',
|
||||
'pid' => 0,
|
||||
];
|
||||
|
||||
$redis = new \Redis();
|
||||
$redis->connect('127.0.0.1', 6379);
|
||||
$redis->auth('qwe2019@');
|
||||
$redis->select(2);
|
||||
|
||||
// 根据 ext_data.source 选择对应队列
|
||||
$msgKey = ($source === 'qiwe') ? 'QiweMessage' : 'Message';
|
||||
$redis->lpush($msgKey, json_encode($msg));
|
||||
|
||||
\think\Log::info("[WmsNotify] reply 已发送: source={$source} group={$groupId} key={$msgKey}");
|
||||
} catch (\Exception $e) {
|
||||
\think\Log::error("[WmsNotify] reply 发送失败: " . $e->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user