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=存客宝