Merge branch 'master' into develop

# Conflicts:
#	app/command/DomainCommand.php
#	app/common/utils/FeishuMessage.php
#	app/queue/redis/FeishuMessage.php
#	app/queue/redis/InquiryToCrm.php
This commit is contained in:
mzl
2025-07-29 19:39:17 +08:00
parent e191788e0a
commit caa04809a9
5 changed files with 125 additions and 10 deletions
+1 -1
View File
@@ -41,7 +41,7 @@ class DomainCommand extends Command
* @param string $oldDomain 旧域名(如: http://219.157.255.213:25326)
* @return string 处理后的富文本内容
*/
function processRichTextImagesEnhanced($content, $newDomain = 'https://fdesk.hnxinyouhe.com', $oldDomain = 'http://219.157.255.213:25326') {
function processRichTextImagesEnhanced($content, $newDomain = 'https://x-server.hnxinyouhe.com', $oldDomain = 'http://219.157.255.213:25326') {
// 标准化域名格式(去除末尾斜杠)
$newDomain = rtrim($newDomain, '/');
$oldDomain = rtrim($oldDomain, '/');