From 69e2acd15675c11392948d3c1995c644360b4033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?= Date: Mon, 11 Aug 2025 14:11:11 +0800 Subject: [PATCH] =?UTF-8?q?FEAT=20=3D>=20=E6=9C=AC=E6=AC=A1=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=A1=B9=E7=9B=AE=E4=B8=BA=EF=BC=9A=E9=87=8D=E6=9E=84?= =?UTF-8?q?=20PostCreateAddFriendPlanV1Controller=20=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=EF=BC=8C=E7=BB=A7=E6=89=BF=E8=87=AA=20BaseController?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=AD=A3=E8=AE=BE=E5=A4=87=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=BA=20'deveiceGroups'=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BB=A5=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=80=A7=E3=80=82=E5=90=8C=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E9=85=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/PostCreateAddFriendPlanV1Controller.php | 12 ++++++------ nkebao/.env.development | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php b/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php index 3429f4b7..8b72c10a 100644 --- a/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php +++ b/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php @@ -2,15 +2,15 @@ namespace app\cunkebao\controller\plan; +use app\cunkebao\controller\BaseController; use library\ResponseHelper; -use think\Controller; use think\Db; use think\facade\Request; /** * 获客场景控制器 */ -class PostCreateAddFriendPlanV1Controller extends Controller +class PostCreateAddFriendPlanV1Controller extends BaseController { @@ -66,7 +66,7 @@ class PostCreateAddFriendPlanV1Controller extends Controller return ResponseHelper::error('场景ID不能为空', 400); } - if (empty($params['device'])) { + if (empty($params['deveiceGroups'])) { return ResponseHelper::error('请选择设备', 400); } @@ -78,7 +78,7 @@ class PostCreateAddFriendPlanV1Controller extends Controller 'customTags' => $params['customTags'] ?? [], ]; $reqConf = [ - 'device' => $params['device'] ?? [], + 'device' => $params['deveiceGroups'] ?? [], 'remarkType' => $params['remarkType'] ?? '', 'greeting' => $params['greeting'] ?? '', 'addFriendInterval' => $params['addFriendInterval'] ?? '', @@ -118,8 +118,8 @@ class PostCreateAddFriendPlanV1Controller extends Controller 'reqConf' => json_encode($reqConf, JSON_UNESCAPED_UNICODE), 'msgConf' => json_encode($msgConf, JSON_UNESCAPED_UNICODE), 'tagConf' => json_encode($tagConf, JSON_UNESCAPED_UNICODE), - 'userId' => $params['userInfo']['id'] ?? 0, - 'companyId' => $params['userInfo']['companyId'] ?? 0, + 'userId' => $this->getUserInfo('id'), + 'companyId' => $this->getUserInfo('companyId'), 'status' => 1, 'apiKey' => $this->generateApiKey(), // 生成API密钥 'createTime'=> time(), diff --git a/nkebao/.env.development b/nkebao/.env.development index c008d630..7afdd84c 100644 --- a/nkebao/.env.development +++ b/nkebao/.env.development @@ -1,4 +1,4 @@ # 基础环境变量示例 -VITE_API_BASE_URL=http://www.yishi.com -# VITE_API_BASE_URL=https://ckbapi.quwanzhi.com +# VITE_API_BASE_URL=http://www.yishi.com +VITE_API_BASE_URL=https://ckbapi.quwanzhi.com VITE_APP_TITLE=存客宝