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
+14 -4
View File
@@ -7,13 +7,23 @@ use Webman\Exception\BusinessException;
class FeishuMessage
{
protected $app_id = 'cli_a72f13d6c022500d';
protected $app_secret = 'Kxtbq70OQWrEhpltrufRZc76z7kjDqPT';
protected $app_id = 'cli_a6183b882cb8500d';
protected $app_secret = 'VqYib48u4EtDIa6nG9qH3f0fYCA1bCvs';
protected $state = 'hesu';
protected $class = null;
public function __construct()
public function __construct($options = [])
{
$this->class = new Feishu($this->app_id, $this->app_secret);
if (isset($options['app_id']) && $options['app_id']) {
$this->app_id = $options['app_id'];
}
if (isset($options['app_secret']) && $options['app_secret']) {
$this->app_secret = $options['app_secret'];
}
if (isset($options['state']) && $options['state']) {
$this->state = $options['state'];
}
$this->class = new Feishu($this->app_id, $this->app_secret, $this->state);
}
/**