From 54e1e0c937b5d56bb3d0f977df11d24f4bedce19 Mon Sep 17 00:00:00 2001 From: wh <382379437@qq.com> Date: Sat, 29 Mar 2025 14:00:36 +0800 Subject: [PATCH] fixed --- superadmin/application/admin/controller/Gechatroom.php | 6 +++--- .../application/admin/controller/Gewechatfriends.php | 6 +++--- superadmin/application/admin/controller/Wxperson.php | 4 ++-- superadmin/application/admin/controller/auth/Admin.php | 4 ++-- superadmin/application/api/logic/BaseLogic.php | 2 +- .../{GechatroomLogic.php => GechatroomWechatLogic.php} | 8 ++++---- .../application/api/logic/GewechatFriendsWechatLogic.php | 2 +- .../logic/{PersonalLogic.php => PersonalWechatLogic.php} | 2 +- .../api/logic/{TokenLogic.php => TokenWechatLogic.php} | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) rename superadmin/application/api/logic/{GechatroomLogic.php => GechatroomWechatLogic.php} (92%) mode change 100755 => 100644 rename admin/application/api/logic/GewechatFriendsLogic.php => superadmin/application/api/logic/GewechatFriendsWechatLogic.php (97%) mode change 100755 => 100644 rename superadmin/application/api/logic/{PersonalLogic.php => PersonalWechatLogic.php} (91%) rename superadmin/application/api/logic/{TokenLogic.php => TokenWechatLogic.php} (95%) mode change 100755 => 100644 diff --git a/superadmin/application/admin/controller/Gechatroom.php b/superadmin/application/admin/controller/Gechatroom.php index 91970c2..ccf77e7 100755 --- a/superadmin/application/admin/controller/Gechatroom.php +++ b/superadmin/application/admin/controller/Gechatroom.php @@ -9,7 +9,7 @@ namespace app\admin\controller; -use app\api\logic\GechatroomLogic; +use app\api\logic\GechatroomWechatLogic; use think\Controller; class Gechatroom extends Controller @@ -37,7 +37,7 @@ class Gechatroom extends Controller if(empty($ai_config_id)){ throw new \Exception('ai_config_id不能为空'); } - $logic = new GechatroomLogic(); + $logic = new GechatroomWechatLogic(); $data = $logic->getChatroomList($ai_config_id); //dump($data);die; //缓存群成员列表 @@ -65,7 +65,7 @@ class Gechatroom extends Controller if(empty($ai_config_id)){ throw new \Exception('ai_config_id不能为空'); } - $data = (new GechatroomLogic())->getChatroomList($ai_config_id); + $data = (new GechatroomWechatLogic())->getChatroomList($ai_config_id); //缓存群成员列表 cache('cache_getChatroomList_data'.session_admin_firm_id(),$data['memberList'],86400); $memberList = $data[$chatroom_id]['memberList']; diff --git a/superadmin/application/admin/controller/Gewechatfriends.php b/superadmin/application/admin/controller/Gewechatfriends.php index e7a9abe..3b62295 100755 --- a/superadmin/application/admin/controller/Gewechatfriends.php +++ b/superadmin/application/admin/controller/Gewechatfriends.php @@ -9,7 +9,7 @@ namespace app\admin\controller; -use app\api\logic\GewechatFriendsLogic; +use app\api\logic\GewechatFriendsWechatLogic; use think\Controller; class Gewechatfriends extends Controller @@ -32,7 +32,7 @@ class Gewechatfriends extends Controller $data = cache('cache_getFriendDetailList_data'.session_admin_firm_id()); return json(['list' => $data, 'total' => count($data)]); } - $obj_logic = new GewechatFriendsLogic(); + $obj_logic = new GewechatFriendsWechatLogic(); $ai_config_id = input('ai_config_id'); if(empty($ai_config_id)){ throw new \Exception('请先配置AI客服'); @@ -54,7 +54,7 @@ class Gewechatfriends extends Controller $data = cache('cache_getFriendDetailList_data'.session_admin_firm_id()); return json(['list' => $data, 'total' => count($data)]); } - $obj_logic = new GewechatFriendsLogic(); + $obj_logic = new GewechatFriendsWechatLogic(); $ai_config_id = input('ai_config_id'); $obj_logic->setBaseUrlByAiCustmerConfig($ai_config_id); $res = $obj_logic->getFriendDetailList(); diff --git a/superadmin/application/admin/controller/Wxperson.php b/superadmin/application/admin/controller/Wxperson.php index bdc8035..1819023 100644 --- a/superadmin/application/admin/controller/Wxperson.php +++ b/superadmin/application/admin/controller/Wxperson.php @@ -9,7 +9,7 @@ namespace app\admin\controller; -use app\api\logic\PersonalLogic; +use app\api\logic\PersonalWechatLogic; use think\Controller; use wanghua\general_utility_tools_php\tool\Tools; @@ -21,7 +21,7 @@ class Wxperson extends Controller public function getProfile() { Tools::log_to_write_txt(['查询个人信息，入参:'=>input()]); - $logic = new PersonalLogic(); + $logic = new PersonalWechatLogic(); $base_url = input('base_url'); if(empty($base_url)){ throw new \Exception('请先配置AI客服'); diff --git a/superadmin/application/admin/controller/auth/Admin.php b/superadmin/application/admin/controller/auth/Admin.php index d6b961d..41ae220 100755 --- a/superadmin/application/admin/controller/auth/Admin.php +++ b/superadmin/application/admin/controller/auth/Admin.php @@ -4,7 +4,7 @@ namespace app\admin\controller\auth; use app\admin\model\AuthGroup; use app\admin\model\AuthGroupAccess; -use app\api\logic\GewechatFriendsLogic; +use app\api\logic\GewechatFriendsWechatLogic; use app\common\controller\Backend; use fast\Random; use fast\Tree; @@ -299,7 +299,7 @@ class Admin extends Backend } function getRelWxids(){ - $friends = (new GewechatFriendsLogic())->getFriendDetailList(); + $friends = (new GewechatFriendsWechatLogic())->getFriendDetailList(); return json(['data'=>$friends,'total'=>count($friends)]); } diff --git a/superadmin/application/api/logic/BaseLogic.php b/superadmin/application/api/logic/BaseLogic.php index f461506..1b3823b 100755 --- a/superadmin/application/api/logic/BaseLogic.php +++ b/superadmin/application/api/logic/BaseLogic.php @@ -37,7 +37,7 @@ class BaseLogic if(empty($this->base_url)){ throw new \Exception('请先设置ai客服配置'); } - $tokenArr = (new TokenLogic())->getToken(); + $tokenArr = (new TokenWechatLogic())->getToken(); $postdata['appId'] = $tokenArr['appId']; $domain = $this->base_url; $timeout = 4; diff --git a/superadmin/application/api/logic/GechatroomLogic.php b/superadmin/application/api/logic/GechatroomWechatLogic.php old mode 100755 new mode 100644 similarity index 92% rename from superadmin/application/api/logic/GechatroomLogic.php rename to superadmin/application/api/logic/GechatroomWechatLogic.php index 9279377..8241545 --- a/superadmin/application/api/logic/GechatroomLogic.php +++ b/superadmin/application/api/logic/GechatroomWechatLogic.php @@ -11,7 +11,7 @@ namespace app\api\logic; use wanghua\general_utility_tools_php\tool\Tools; -class GechatroomLogic extends BaseLogic +class GechatroomWechatLogic extends BaseWechatLogic { /** @@ -26,7 +26,7 @@ class GechatroomLogic extends BaseLogic //$this->getChatroomMemberList();die; //$base_url = config('gewechat.base_url'); //去查询群名称 - $logic = new GewechatFriendsLogic(); + $logic = new GewechatFriendsWechatLogic(); $logic->setBaseUrlByAiCustmerConfig($ai_config_id); $wxids_arr = $logic->getFriendWxIdsList(); $chatrooms = $wxids_arr['data']['chatrooms']; @@ -49,7 +49,7 @@ class GechatroomLogic extends BaseLogic function getChatroomMemberList(){ //去查询群名称 - $wxids_arr = (new GewechatFriendsLogic())->getFriendWxIdsList(); + $wxids_arr = (new GewechatFriendsWechatLogic())->getFriendWxIdsList(); $chatrooms = $wxids_arr['data']['chatrooms']; dump($chatrooms); $url = '/group/getChatroomMemberDetail'; @@ -75,7 +75,7 @@ class GechatroomLogic extends BaseLogic */ function getChatroomMemberDetail(){ //去查询群名称 - $wxids_arr = (new GewechatFriendsLogic())->getFriendWxIdsList(); + $wxids_arr = (new GewechatFriendsWechatLogic())->getFriendWxIdsList(); $chatrooms = $wxids_arr['data']['chatrooms']; dump($chatrooms); $url = '/group/getChatroomMemberDetail'; diff --git a/admin/application/api/logic/GewechatFriendsLogic.php b/superadmin/application/api/logic/GewechatFriendsWechatLogic.php old mode 100755 new mode 100644 similarity index 97% rename from admin/application/api/logic/GewechatFriendsLogic.php rename to superadmin/application/api/logic/GewechatFriendsWechatLogic.php index 6b26b28..2fd8f2a --- a/admin/application/api/logic/GewechatFriendsLogic.php +++ b/superadmin/application/api/logic/GewechatFriendsWechatLogic.php @@ -11,7 +11,7 @@ namespace app\api\logic; use wanghua\general_utility_tools_php\tool\Tools; -class GewechatFriendsLogic extends BaseLogic +class GewechatFriendsWechatLogic extends BaseWechatLogic { diff --git a/superadmin/application/api/logic/PersonalLogic.php b/superadmin/application/api/logic/PersonalWechatLogic.php similarity index 91% rename from superadmin/application/api/logic/PersonalLogic.php rename to superadmin/application/api/logic/PersonalWechatLogic.php index eb56891..9444421 100644 --- a/superadmin/application/api/logic/PersonalLogic.php +++ b/superadmin/application/api/logic/PersonalWechatLogic.php @@ -11,7 +11,7 @@ namespace app\api\logic; use wanghua\general_utility_tools_php\tool\Tools; -class PersonalLogic extends BaseLogic +class PersonalWechatLogic extends BaseWechatLogic { function getProfile() { diff --git a/superadmin/application/api/logic/TokenLogic.php b/superadmin/application/api/logic/TokenWechatLogic.php old mode 100755 new mode 100644 similarity index 95% rename from superadmin/application/api/logic/TokenLogic.php rename to superadmin/application/api/logic/TokenWechatLogic.php index 40ca4cc..fa7146a --- a/superadmin/application/api/logic/TokenLogic.php +++ b/superadmin/application/api/logic/TokenWechatLogic.php @@ -7,7 +7,7 @@ */ namespace app\api\logic; -class TokenLogic extends BaseLogic +class TokenWechatLogic extends BaseWechatLogic { public function __construct() {