From 121de0459d4a049a2e323efd8de1a0d4584d2e52 Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 20 Oct 2023 16:41:08 +0800 Subject: [PATCH 1/8] fixed --- extend/workerim/start_gateway.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extend/workerim/start_gateway.php b/extend/workerim/start_gateway.php index 4d3e35507..3885d8004 100644 --- a/extend/workerim/start_gateway.php +++ b/extend/workerim/start_gateway.php @@ -10,13 +10,12 @@ require_once __DIR__ . '/../../vendor/autoload.php'; $gateway = new Gateway("Websocket://0.0.0.0:8282"); // gateway名称，status方便查看 -$gateway->name = 'worker_im'; +$gateway->name = 'worker_task_im'; // gateway进程数，一般设置2个就足够 $gateway->count = 4; // 本机ip，分布式部署时使用内网ip - //ce_shi $gateway->lanIp = '172.19.97.179'; // 内部通讯起始端口，假如$gateway->count=2，起始端口为2900 From 790d357c49d815ed1a21fce5b85580453214314d Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 20 Oct 2023 17:11:47 +0800 Subject: [PATCH 2/8] fixed --- extend/workerim/start_gateway.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extend/workerim/start_gateway.php b/extend/workerim/start_gateway.php index 3885d8004..6dd9ce80a 100644 --- a/extend/workerim/start_gateway.php +++ b/extend/workerim/start_gateway.php @@ -19,8 +19,8 @@ $gateway->count = 4; $gateway->lanIp = '172.19.97.179'; // 内部通讯起始端口，假如$gateway->count=2，起始端口为2900 -// 则一般会使用2900 2901 2902 2903 4个端口作为内部通讯端口 -$gateway->startPort = 2900; +// 则一般会使用3900 3901 3902 3903 4个端口作为内部通讯端口 +$gateway->startPort = 3900; // 服务注册地址 $gateway->registerAddress = '127.0.0.1:1236'; From d79fabc5634119a5ea375c348defb1da031a4ebc Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 20 Oct 2023 17:21:57 +0800 Subject: [PATCH 3/8] fixed --- extend/workerim/start_gateway.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extend/workerim/start_gateway.php b/extend/workerim/start_gateway.php index 6dd9ce80a..1840cedf7 100644 --- a/extend/workerim/start_gateway.php +++ b/extend/workerim/start_gateway.php @@ -23,7 +23,7 @@ $gateway->lanIp = '172.19.97.179'; $gateway->startPort = 3900; // 服务注册地址 -$gateway->registerAddress = '127.0.0.1:1236'; +$gateway->registerAddress = '172.19.97.179:1236'; // 心跳间隔 $gateway->pingInterval = 20; From d89974dd51bd6f7f454e4bf261b7df47d6133bfa Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Fri, 20 Oct 2023 17:23:13 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0question?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/XunFeiController.php | 2 +- app/job/AiAianalyse.php | 2 +- composer.lock | 20 ++++++++++++++++++-- vendor/composer/installed.json | 20 ++++++++++++++++++-- vendor/composer/installed.php | 4 ++-- vendor/services.php | 2 +- 6 files changed, 41 insertions(+), 9 deletions(-) diff --git a/app/api/controller/XunFeiController.php b/app/api/controller/XunFeiController.php index f1aaadc42..5e3fb0ee6 100644 --- a/app/api/controller/XunFeiController.php +++ b/app/api/controller/XunFeiController.php @@ -114,7 +114,7 @@ class XunFeiController extends BaseApiController foreach($data_field as $k=>$v) { $demand .= $k . '：' . $v . '；'; } - $question = "分析以下{$type_name}信息【{$demand}】请问有那些商机？"; + $question = "根据以下{$type_name}信息【{$demand}】请问有那些商机？"; $chat=new ChatClient($this->app_id,$this->api_key,$this->api_secret); $client = new Client($chat->assembleAuthUrl('wss://spark-api.xf-yun.com/v2.1/chat')); // 连接到 WebSocket 服务器 diff --git a/app/job/AiAianalyse.php b/app/job/AiAianalyse.php index d32417d49..be42e075a 100644 --- a/app/job/AiAianalyse.php +++ b/app/job/AiAianalyse.php @@ -34,7 +34,7 @@ class AiAianalyse foreach($data_field as $k=>$v) { $demand .= $k . '：' . $v . '；'; } - $question = "分析以下{$type_name}信息【{$demand}】请问有那些商机？需要购买哪些商品？"; + $question = "根据以下{$type_name}信息【{$demand}】请问有那些商机？需要购买哪些商品？"; try { $chat=new ChatClient($this->app_id,$this->api_key,$this->api_secret); $client = new Client($chat->assembleAuthUrl('wss://spark-api.xf-yun.com/v2.1/chat')); diff --git a/composer.lock b/composer.lock index 783e0c020..d847de315 100644 --- a/composer.lock +++ b/composer.lock @@ -5301,11 +5301,22 @@ { "name": "textalk/websocket", "version": "1.6.3", + "source": { + "type": "git", + "url": "https://github.com/Textalk/websocket-php.git", + "reference": "67de79745b1a357caf812bfc44e0abf481cee012" + }, "dist": { "type": "zip", - "url": "https://mirrors.cloud.tencent.com/repository/composer/textalk/websocket/1.6.3/textalk-websocket-1.6.3.zip", + "url": "https://api.github.com/repos/Textalk/websocket-php/zipball/67de79745b1a357caf812bfc44e0abf481cee012", "reference": "67de79745b1a357caf812bfc44e0abf481cee012", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.4 | ^8.0", @@ -5325,6 +5336,7 @@ "WebSocket\\": "lib" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "ISC" ], @@ -5337,6 +5349,10 @@ } ], "description": "WebSocket client and server", + "support": { + "issues": "https://github.com/Textalk/websocket-php/issues", + "source": "https://github.com/Textalk/websocket-php/tree/1.6.3" + }, "time": "2022-11-07T18:59:33+00:00" }, { diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 2452f376c..31ec784ba 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -5610,11 +5610,22 @@ "name": "textalk/websocket", "version": "1.6.3", "version_normalized": "1.6.3.0", + "source": { + "type": "git", + "url": "https://github.com/Textalk/websocket-php.git", + "reference": "67de79745b1a357caf812bfc44e0abf481cee012" + }, "dist": { "type": "zip", - "url": "https://mirrors.cloud.tencent.com/repository/composer/textalk/websocket/1.6.3/textalk-websocket-1.6.3.zip", + "url": "https://api.github.com/repos/Textalk/websocket-php/zipball/67de79745b1a357caf812bfc44e0abf481cee012", "reference": "67de79745b1a357caf812bfc44e0abf481cee012", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.4 | ^8.0", @@ -5636,6 +5647,7 @@ "WebSocket\\": "lib" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "ISC" ], @@ -5648,6 +5660,10 @@ } ], "description": "WebSocket client and server", + "support": { + "issues": "https://github.com/Textalk/websocket-php/issues", + "source": "https://github.com/Textalk/websocket-php/tree/1.6.3" + }, "install-path": "../textalk/websocket" }, { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index a0107ca66..6fc710214 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'topthink/think', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'a33f154b3124fdc0dfd6899f4340ae6e48e88e3a', + 'reference' => 'a000ab203c7a08f4790746e40d2de9aa33cfc61d', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -775,7 +775,7 @@ 'topthink/think' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'a33f154b3124fdc0dfd6899f4340ae6e48e88e3a', + 'reference' => 'a000ab203c7a08f4790746e40d2de9aa33cfc61d', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/vendor/services.php b/vendor/services.php index 88f0716e9..75c4f88ac 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', From e66e0d1a687efce0f49f3903e1d2d15c32389ec7 Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 20 Oct 2023 17:28:41 +0800 Subject: [PATCH 5/8] fixed register ip --- app/common/controller/ImController.php | 9 ++++++++- extend/workerim/start_gateway.php | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/common/controller/ImController.php b/app/common/controller/ImController.php index 1fd72668d..a9a9161c3 100644 --- a/app/common/controller/ImController.php +++ b/app/common/controller/ImController.php @@ -8,12 +8,19 @@ use app\common\model\Company; use app\common\model\im\UserImMessage; use app\common\model\user\User; use GatewayClient\Gateway; +use think\App; use think\facade\Db; use think\response\Json; class ImController extends BaseLikeAdminController { - //获取场景值 + public function __construct(App $app) + { + parent::__construct($app); + Gateway::$registerAddress = "172.19.97.179:1236"; + } + + //获取场景值 private function sceneText($scene): string { if($scene == 0){ diff --git a/extend/workerim/start_gateway.php b/extend/workerim/start_gateway.php index 1840cedf7..6dd9ce80a 100644 --- a/extend/workerim/start_gateway.php +++ b/extend/workerim/start_gateway.php @@ -23,7 +23,7 @@ $gateway->lanIp = '172.19.97.179'; $gateway->startPort = 3900; // 服务注册地址 -$gateway->registerAddress = '172.19.97.179:1236'; +$gateway->registerAddress = '127.0.0.1:1236'; // 心跳间隔 $gateway->pingInterval = 20; From 6144dea2711dfbc0c3433f61b035f7d61c6a7708 Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 20 Oct 2023 17:34:34 +0800 Subject: [PATCH 6/8] fixed register ip --- app/common/controller/ImController.php | 2 +- extend/workerim/start_businessworker.php | 2 +- extend/workerim/start_gateway.php | 2 +- extend/workerim/start_register.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/common/controller/ImController.php b/app/common/controller/ImController.php index a9a9161c3..4322edf1d 100644 --- a/app/common/controller/ImController.php +++ b/app/common/controller/ImController.php @@ -17,7 +17,7 @@ class ImController extends BaseLikeAdminController public function __construct(App $app) { parent::__construct($app); - Gateway::$registerAddress = "172.19.97.179:1236"; + Gateway::$registerAddress = "172.19.97.179:1256"; } //获取场景值 diff --git a/extend/workerim/start_businessworker.php b/extend/workerim/start_businessworker.php index 1202347e6..e1ae709ff 100644 --- a/extend/workerim/start_businessworker.php +++ b/extend/workerim/start_businessworker.php @@ -17,7 +17,7 @@ $worker->name = 'PushBusinessWorker'; $worker->count = 4; // 服务注册地址 -$worker->registerAddress = '127.0.0.1:1236'; +$worker->registerAddress = '127.0.0.1:1256'; // 注册服务类 $worker->eventHandler = 'workerim\Events'; diff --git a/extend/workerim/start_gateway.php b/extend/workerim/start_gateway.php index 6dd9ce80a..2c3c3172f 100644 --- a/extend/workerim/start_gateway.php +++ b/extend/workerim/start_gateway.php @@ -23,7 +23,7 @@ $gateway->lanIp = '172.19.97.179'; $gateway->startPort = 3900; // 服务注册地址 -$gateway->registerAddress = '127.0.0.1:1236'; +$gateway->registerAddress = '127.0.0.1:1256'; // 心跳间隔 $gateway->pingInterval = 20; diff --git a/extend/workerim/start_register.php b/extend/workerim/start_register.php index 34a5000bf..cd23494d2 100644 --- a/extend/workerim/start_register.php +++ b/extend/workerim/start_register.php @@ -6,7 +6,7 @@ use \GatewayWorker\Register; require_once __DIR__ . '/../../vendor/autoload.php'; // register 必须是text协议，切记不能将register端口开放给外网 -$register = new Register('text://127.0.0.1:1236'); +$register = new Register('text://127.0.0.1:1256'); // 如果不是在根目录启动，则运行runAll方法 if(!defined('GLOBAL_START')) From 9d24f39dfaf528969491972957426439b3e784e6 Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 20 Oct 2023 17:41:55 +0800 Subject: [PATCH 7/8] fixed register ip --- app/common/controller/ImController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/controller/ImController.php b/app/common/controller/ImController.php index 4322edf1d..70d509ac0 100644 --- a/app/common/controller/ImController.php +++ b/app/common/controller/ImController.php @@ -17,7 +17,7 @@ class ImController extends BaseLikeAdminController public function __construct(App $app) { parent::__construct($app); - Gateway::$registerAddress = "172.19.97.179:1256"; + Gateway::$registerAddress = "127.0.0.1:1256"; } //获取场景值 From 0f2c0e0982034c262c3693a2068cc83dff45e180 Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 20 Oct 2023 17:47:22 +0800 Subject: [PATCH 8/8] fixed workerman ip --- app/common/controller/ImController.php | 2 +- extend/workerim/start_businessworker.php | 2 +- extend/workerim/start_gateway.php | 2 +- extend/workerim/start_register.php | 2 +- vendor/workerman/gateway-worker/src/BusinessWorker.php | 2 +- vendor/workerman/gateway-worker/src/Gateway.php | 2 +- vendor/workerman/gateway-worker/src/Lib/Gateway.php | 2 +- vendor/workerman/gatewayclient/Gateway.php | 2 +- vendor/workerman/gatewayclient/README.md | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/common/controller/ImController.php b/app/common/controller/ImController.php index 70d509ac0..4322edf1d 100644 --- a/app/common/controller/ImController.php +++ b/app/common/controller/ImController.php @@ -17,7 +17,7 @@ class ImController extends BaseLikeAdminController public function __construct(App $app) { parent::__construct($app); - Gateway::$registerAddress = "127.0.0.1:1256"; + Gateway::$registerAddress = "172.19.97.179:1256"; } //获取场景值 diff --git a/extend/workerim/start_businessworker.php b/extend/workerim/start_businessworker.php index e1ae709ff..74fa26bc3 100644 --- a/extend/workerim/start_businessworker.php +++ b/extend/workerim/start_businessworker.php @@ -17,7 +17,7 @@ $worker->name = 'PushBusinessWorker'; $worker->count = 4; // 服务注册地址 -$worker->registerAddress = '127.0.0.1:1256'; +$worker->registerAddress = '172.19.97.179:1256'; // 注册服务类 $worker->eventHandler = 'workerim\Events'; diff --git a/extend/workerim/start_gateway.php b/extend/workerim/start_gateway.php index 2c3c3172f..7437e0276 100644 --- a/extend/workerim/start_gateway.php +++ b/extend/workerim/start_gateway.php @@ -23,7 +23,7 @@ $gateway->lanIp = '172.19.97.179'; $gateway->startPort = 3900; // 服务注册地址 -$gateway->registerAddress = '127.0.0.1:1256'; +$gateway->registerAddress = '172.19.97.179:1256'; // 心跳间隔 $gateway->pingInterval = 20; diff --git a/extend/workerim/start_register.php b/extend/workerim/start_register.php index cd23494d2..5d4854240 100644 --- a/extend/workerim/start_register.php +++ b/extend/workerim/start_register.php @@ -6,7 +6,7 @@ use \GatewayWorker\Register; require_once __DIR__ . '/../../vendor/autoload.php'; // register 必须是text协议，切记不能将register端口开放给外网 -$register = new Register('text://127.0.0.1:1256'); +$register = new Register('text://172.19.97.179:1256'); // 如果不是在根目录启动，则运行runAll方法 if(!defined('GLOBAL_START')) diff --git a/vendor/workerman/gateway-worker/src/BusinessWorker.php b/vendor/workerman/gateway-worker/src/BusinessWorker.php index a87831f2f..bf9bea5c0 100644 --- a/vendor/workerman/gateway-worker/src/BusinessWorker.php +++ b/vendor/workerman/gateway-worker/src/BusinessWorker.php @@ -43,7 +43,7 @@ class BusinessWorker extends Worker * * @var string|array */ - public $registerAddress = '127.0.0.1:1236'; + public $registerAddress = '172.19.97.179:1256'; /** * 事件处理类，默认是 Event 类 diff --git a/vendor/workerman/gateway-worker/src/Gateway.php b/vendor/workerman/gateway-worker/src/Gateway.php index 205dc42db..48453b95a 100644 --- a/vendor/workerman/gateway-worker/src/Gateway.php +++ b/vendor/workerman/gateway-worker/src/Gateway.php @@ -83,7 +83,7 @@ class Gateway extends Worker * * @var string|array */ - public $registerAddress = '127.0.0.1:1236'; + public $registerAddress = '172.19.97.179:1256'; /** * 是否可以平滑重启，gateway 不能平滑重启，否则会导致连接断开 diff --git a/vendor/workerman/gateway-worker/src/Lib/Gateway.php b/vendor/workerman/gateway-worker/src/Lib/Gateway.php index a027bc49b..e3caa176e 100644 --- a/vendor/workerman/gateway-worker/src/Lib/Gateway.php +++ b/vendor/workerman/gateway-worker/src/Lib/Gateway.php @@ -34,7 +34,7 @@ class Gateway * * @var string|array */ - public static $registerAddress = '127.0.0.1:1236'; + public static $registerAddress = '172.19.97.179:1256'; /** * 秘钥 diff --git a/vendor/workerman/gatewayclient/Gateway.php b/vendor/workerman/gatewayclient/Gateway.php index f79f81fda..f3ea69040 100644 --- a/vendor/workerman/gatewayclient/Gateway.php +++ b/vendor/workerman/gatewayclient/Gateway.php @@ -36,7 +36,7 @@ class Gateway * * @var string|array */ - public static $registerAddress = '127.0.0.1:1236'; + public static $registerAddress = '172.19.97.179:1256'; /** * 秘钥 diff --git a/vendor/workerman/gatewayclient/README.md b/vendor/workerman/gatewayclient/README.md index 50aa17139..95b36bff1 100644 --- a/vendor/workerman/gatewayclient/README.md +++ b/vendor/workerman/gatewayclient/README.md @@ -64,7 +64,7 @@ require_once '真实路径/vendor/autoload.php'; * === 如果GatewayClient和GatewayWorker在同一台服务器 === * GatewayClient和Register服务都在一台服务器上，ip填写127.0.0.1及即可，无需其它设置。 **/ -Gateway::$registerAddress = '127.0.0.1:1236'; +Gateway::$registerAddress = '172.19.97.179:1256'; // GatewayClient支持GatewayWorker中的所有接口(Gateway::closeCurrentClient Gateway::sendToCurrentClient除外) Gateway::sendToAll($data);