fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码同步提交

Browse Source
This commit is contained in:
wong
2025-09-16 09:57:06 +08:00
parent 2b3c41ce36
commit f577dbdd70
11 changed files with 236 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Server/application/chukebao/controller/CustomerServiceController.php Normal file
View File

@@ -0,0 +1,41 @@
<?php
namespace app\chukebao\controller;
use library\ResponseHelper;
use think\Db;
class CustomerServiceController extends BaseController
{
public function getList(){
$accountId = $this->getUserInfo('s2_accountId');
if (empty($accountId)){
return ResponseHelper::error('请先登录');
}
$accountIds1= Db::table('s2_wechat_friend')->where(['accountId' => $accountId,'isDeleted' => 0])->group('wechatAccountId')->column('wechatAccountId');
$accountIds2 = Db::table('s2_wechat_chatroom')->where(['accountId' => $accountId,'isDeleted' => 0])->group('wechatAccountId')->column('wechatAccountId');
// 确保即使有空数组也不会报错，并且去除重复值
$accountIds = array_unique(array_merge($accountIds1 ?: [], $accountIds2 ?: []));
$list = Db::table('s2_wechat_account')
->whereIn('id',$accountIds)
->order('id desc')
->group('id')
->select();
foreach ($list as $k=>&$v){
$v['createTime'] = !empty($v['createTime']) ? date('Y-m-d H:i:s',$v['createTime']) : '';
$v['updateTime'] = !empty($v['updateTime']) ? date('Y-m-d H:i:s',$v['updateTime']) : '';
$v['labels'] = json_decode($v['labels'],true);
unset(
$v['accountUserName'],
$v['accountRealName'],
$v['accountNickname'],
);
}
unset($v);
return ResponseHelper::success($list);
}
}

41
Server/application/chukebao/controller/LoginController.php
View File

@@ -7,6 +7,8 @@ use Exception;
use library\ResponseHelper;
use think\Db;
use think\Controller;
use think\facade\Cache;
/**
* 认证控制器
* 处理用户登录和身份验证
@@ -27,18 +29,27 @@ class LoginController extends Controller
$password = !empty($password) ? $password : $this->request->param('password', '');
$verifySessionId =!empty($verifySessionId) ? $verifySessionId : $this->request->param('verifySessionId', '');
$verifyCode = !empty($verifyCode) ? $verifyCode : $this->request->param('verifyCode', '');
$token = JwtUtil::getRequestToken();
$payload = '';
if (!empty($token)){
$payload = JwtUtil::verifyToken($token);
}
if (empty($username) || empty($password)) {
if ((empty($username) || empty($password)) && empty($payload)){
return ResponseHelper::error('请输入账号密码');
}
// 验证账号是否存在（支持账号或手机号登录）
$user = Db::name('users')
->where(function ($query) use ($username) {
$query->where('account', $username)->whereOr('phone', $username);
})
->where('passwordMd5', md5($password))
->find();
if (empty($payload11)){
$user = Db::name('users')
->where(function ($query) use ($username) {
$query->where('account', $username)->whereOr('phone', $username);
})
->where('passwordMd5', md5($password))
->find();
}else{
$user = $payload;
}
if (empty($user)) {
return ResponseHelper::error('账号不存在或密码错误');
@@ -48,15 +59,12 @@ class LoginController extends Controller
return ResponseHelper::error('账号已禁用');
}
//登录参数
$params = [
'grant_type' => 'password',
'username' => $user['account'],
'password' => !empty($user['passwordLocal']) ? localDecrypt($user['passwordLocal']) : $password
];
try {
// 调用登录接口获取token
$headerData = ['client:kefu-client'];
@@ -68,20 +76,18 @@ class LoginController extends Controller
$result = requestCurl('https://s2.siyuguanli.com:9991/token', $params, 'POST', $header);
$result = handleApiResponse($result);
if (isset($result['access_token']) && !empty($result['access_token'])) {
$userData['kefuData']['token'] = $result;
$kefuData['token'] = $result;
$headerData = ['client:kefu-client'];
$header = setHeader($headerData, $result['access_token']);
$result2 = requestCurl('https://s2.siyuguanli.com:9991/api/account/self', [], 'GET', $header, 'json');
$self = handleApiResponse($result2);
$userData['kefuData']['self'] = $self;
Db::name('users')->where('id', $user['id'])->update(['passwordLocal' => localEncrypt($password),'updateTime' => time()]);
$kefuData['self'] = $self;
Db::name('users')->where('id', $user['id'])->update(['passwordLocal' => localEncrypt($params['password']),'updateTime' => time()]);
}else{
return ResponseHelper::error($result['error_description']);
}
unset($user['passwordMd5'],$user['deleteTime'],$user['passwordLocal']);
unset($user['passwordMd5'],$user['deleteTime']);
$userData['member'] = $user;
// 生成JWT令牌
@@ -89,10 +95,9 @@ class LoginController extends Controller
$token = JwtUtil::createToken($user, $expired);
$token_expired = time() + $expired;
$userData['token'] = $token;
$userData['token_expired'] = $token_expired;
$userData['kefuData'] = $kefuData;
return ResponseHelper::success($userData, '登录成功');
} catch (Exception $e) {

72
Server/application/chukebao/controller/MessageController.php Normal file
View File

@@ -0,0 +1,72 @@
<?php
namespace app\chukebao\controller;
use library\ResponseHelper;
use think\Db;
class MessageController extends BaseController
{
public function getList(){
$page = $this->request->param('page', 1);
$limit = $this->request->param('limit', 10);
$accountId = $this->getUserInfo('s2_accountId');
if (empty($accountId)){
return ResponseHelper::error('请先登录');
}
$chatroomList = Db::table('s2_wechat_chatroom')->alias('wc')
->join(['s2_wechat_message' => 'm'], 'wc.id = m.wechatChatroomId', 'LEFT')
->where(['wc.accountId' => $accountId,'m.type' => 2,' wc.isDeleted' => 0])
->order('m.id desc')
->group('m.wechatChatroomId')
->page($page, $limit)
->select();
$friendIds = Db::table('s2_wechat_friend')
->where(['accountId' => $accountId,' isDeleted' => 0])
->group('id')
->column('id');
$friendList = Db::table('s2_wechat_message')
->where(['type' => 1])
->whereIn('wechatFriendId',$friendIds)
->order('id desc')
->group('wechatFriendId')
->page($page, $limit)
->select();
$list = array_merge($chatroomList,$friendList);
// 按createTime字段从大到小排序
usort($list, function($a, $b) {
return $b['createTime'] <=> $a['createTime'];
});
foreach ($list as $k=>&$v){
$v['createTime'] = !empty($v['createTime']) ? date('Y-m-d H:i:s',$v['createTime']) : '';
$v['wechatTime'] = !empty($v['wechatTime']) ? date('Y-m-d H:i:s',$v['wechatTime']) : '';
if (!empty($v['wechatFriendId'])){
$friend = Db::table('s2_wechat_friend')
->where(['id'=>$v['wechatFriendId']])
->field('id,nickname,avatar')
->find();
$v['msgInfo'] = $friend;
}
if (!empty($v['wechatChatroomId'])){
$chatroom = Db::table('s2_wechat_chatroom')
->where(['id'=>$v['wechatChatroomId']])
->field('id,nickname,chatroomAvatar as avatar')
->find();
$v['msgInfo'] = $chatroom;
}
}
unset($v);
return ResponseHelper::success($list);
}
}

16
Server/application/chukebao/controller/WechatChatroomController.php
View File

@@ -15,7 +15,19 @@ class WechatChatroomController extends BaseController
if (empty($accountId)){
return ResponseHelper::error('请先登录');
}
$list = Db::table('s2_wechat_chatroom')->where('accountId',$accountId)->order('id desc')->page($page, $limit)->select();
return ResponseHelper::success($list);
$query = Db::table('s2_wechat_chatroom')
->where(['accountId' => $accountId,'isDeleted' => 0])
->order('id desc');
$list = $query->page($page, $limit)->select();
$total = $query->count();
foreach ($list as $k=>&$v){
$v['createTime'] = !empty($v['createTime']) ? date('Y-m-d H:i:s',$v['createTime']) : '';
$v['updateTime'] = !empty($v['updateTime']) ? date('Y-m-d H:i:s',$v['updateTime']) : '';
}
unset($v);
return ResponseHelper::success(['list'=>$list,'total'=>$total]);
}
}

17
Server/application/chukebao/controller/WechatFriendController.php
View File

@@ -15,7 +15,20 @@ class WechatFriendController extends BaseController
if (empty($accountId)){
return ResponseHelper::error('请先登录');
}
$list = Db::table('s2_wechat_friend')->where('accountId',$accountId)->order('id desc')->page($page, $limit)->select();
return ResponseHelper::success($list);
$query = Db::table('s2_wechat_friend')
->where(['accountId' => $accountId,'isDeleted' => 0])
->order('id desc');
$list = $query->page($page, $limit)->select();
$total = $query->count();
foreach ($list as $k=>&$v){
$v['createTime'] = !empty($v['createTime']) ? date('Y-m-d H:i:s',$v['createTime']) : '';
$v['updateTime'] = !empty($v['updateTime']) ? date('Y-m-d H:i:s',$v['updateTime']) : '';
$v['passTime'] = !empty($v['passTime']) ? date('Y-m-d H:i:s',$v['passTime']) : '';
}
unset($v);
return ResponseHelper::success(['list'=>$list,'total'=>$total]);
}
}