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-04-15 17:08:52 +08:00
parent 4581ef5ee1
commit 988cd419d4
16 changed files with 580 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Server/application/api/controller/AccountController.php
View File

@@ -104,9 +104,9 @@ class AccountController extends BaseController
if (empty($userName)) {
return errorJson('用户名不能为空');
}
if (!preg_match('/^[a-zA-Z][a-zA-Z0-9]{5,9}$/', $userName)) {
return errorJson('用户名必须以字母开头，只能包含字母和数字，长度6-10位');
}
// if (!preg_match('/^[a-zA-Z][a-zA-Z0-9]{5,9}$/', $userName)) {
// return errorJson('用户名必须以字母开头，只能包含字母和数字，长度6-10位');
// }
if (empty($password)) {
return errorJson('密码不能为空');
}

1
Server/application/common/service/AuthService.php
View File

@@ -168,6 +168,7 @@ class AuthService
// 尝试从缓存获取授权信息
$authorization = Cache::get($cacheKey);
$authorization = 'xwz8Uh2doczeTCqSvakElfZMPn-jRce5WTnKTz3ljqpa63PnUOy5beT3TDhxnGNsROofYzpUphfhraxPrQfXvSuMyxFj_vrMUenzptj6hdG8Y4h1NrPXHFUr5Rlw-cIq0uyZZhjYp6xDTLg-IipgyAvBPdJM0vIgbizbo-agd8_Ubwbl0EOPqrMscYdsGrnv9_Lbr_B4-tHMNMa6yerb6kP6rzx8KQ4mJ6Cr5OmPX2WAmFkYykS3p0erWtb9PGHcxgaI1SVkEF4vH2H_iSOxfz5v27xd4HFE63IA5ZtDHQBNeiR0avST36UJSTZz3vjta9FDsw';
// 如果缓存中没有或已过期，则重新获取
if (empty($authorization)) {

8
Server/application/cunkebao/config/route.php
View File

@@ -57,4 +57,12 @@ Route::group('v1/', function () {
Route::get('detail', 'app\\cunkebao\\controller\\WorkbenchController@detail'); // 获取工作台详情
Route::post('update', 'app\\cunkebao\\controller\\WorkbenchController@update'); // 更新工作台
});
// 内容库相关
Route::group('content/library', function () {
Route::post('create', 'app\\cunkebao\\controller\\ContentLibraryController@create'); // 创建内容库
Route::get('list', 'app\\cunkebao\\controller\\ContentLibraryController@getList'); // 获取内容库列表
Route::post('update', 'app\\cunkebao\\controller\\ContentLibraryController@update'); // 更新内容库
Route::delete('delete', 'app\\cunkebao\\controller\\ContentLibraryController@delete'); // 删除内容库
});
})->middleware(['jwt']);

126
Server/application/cunkebao/controller/ContentLibraryController.php
View File

@@ -21,9 +21,11 @@ class ContentLibraryController extends Controller
$page = $this->request->param('page', 1);
$limit = $this->request->param('limit', 10);
$keyword = $this->request->param('keyword', '');
$sourceType = $this->request->param('sourceType', ''); // 新增：来源类型，1=好友，2=群
$where = [
['userId', '=', $this->request->userInfo['id']]
['userId', '=', $this->request->userInfo['id']],
['isDel', '=', 0] // 只查询未删除的记录
];
// 添加名称模糊搜索
@@ -31,12 +33,34 @@ class ContentLibraryController extends Controller
$where[] = ['name', 'like', '%' . $keyword . '%'];
}
// 添加名称模糊搜索
if (!empty($sourceType)) {
$where[] = ['sourceType', '=', $sourceType];
}
$list = ContentLibrary::where($where)
->field('id,name,description,createTime,updateTime')
->field('id,name,sourceFriends,sourceGroups,keywordInclude,keywordExclude,aiEnabled,aiPrompt,timeEnabled,timeStart,timeEnd,status,sourceType,userId,createTime,updateTime')
->with(['user' => function($query) {
$query->field('id,username');
}])
->order('id', 'desc')
->page($page, $limit)
->select();
// 处理JSON字段
foreach ($list as &$item) {
$item['sourceFriends'] = json_decode($item['sourceFriends'] ?: '[]', true);
$item['sourceGroups'] = json_decode($item['sourceGroups'] ?: '[]', true);
$item['keywordInclude'] = json_decode($item['keywordInclude'] ?: '[]', true);
$item['keywordExclude'] = json_decode($item['keywordExclude'] ?: '[]', true);
// 添加创建人名称
$item['creatorName'] = $item['user']['username'] ?? '';
unset($item['user']); // 移除关联数据
}
unset($item);
$total = ContentLibrary::where($where)->count();
return json([
@@ -46,38 +70,44 @@ class ContentLibraryController extends Controller
'list' => $list,
'total' => $total,
'page' => $page,
'limit' => $limit
]
]);
}
/**
* 获取内容库详情
* @param int $id 内容库ID
* @return \think\response\Json
*/
public function detail($id)
public function detail()
{
$id = $this->request->param('id', 0);
if (empty($id)) {
return json(['code' => 400, 'msg' => '参数错误']);
}
$library = ContentLibrary::where([
['id', '=', $id],
['userId', '=', $this->request->userInfo['id']]
['userId', '=', $this->request->userInfo['id']],
['isDel', '=', 0] // 只查询未删除的记录
])
->field('id,name,description,createTime,updateTime')
->field('id,name,sourceFriends,sourceGroups,keywordInclude,keywordExclude,aiEnabled,aiPrompt,timeEnabled,timeStart,timeEnd,status,userId,companyId,createTime,updateTime')
->find();
if (empty($library)) {
return json(['code' => 404, 'msg' => '内容库不存在']);
}
// 获取内容项目
$items = ContentItem::where('libraryId', $id)->select();
$library['items'] = $items;
// 处理JSON字段转数组
$library['sourceFriends'] = json_decode($library['sourceFriends'] ?: '[]', true);
$library['sourceGroups'] = json_decode($library['sourceGroups'] ?: '[]', true);
$library['keywordInclude'] = json_decode($library['keywordInclude'] ?: '[]', true);
$library['keywordExclude'] = json_decode($library['keywordExclude'] ?: '[]', true);
return json(['code' => 200, 'msg' => '获取成功', 'data' => $library]);
return json([
'code' => 200,
'msg' => '获取成功',
'data' => $library
]);
}
/**
@@ -93,31 +123,52 @@ class ContentLibraryController extends Controller
// 获取请求参数
$param = $this->request->post();
// 简单验证
// 验证参数
if (empty($param['name'])) {
return json(['code' => 400, 'msg' => '内容库名称不能为空']);
}
// 检查内容库名称是否已存在
$exists = ContentLibrary::where('name', $param['name'])->find();
if ($exists) {
return json(['code' => 400, 'msg' => '内容库名称已存在']);
}
Db::startTrans();
try {
// 构建数据
$data = [
'name' => $param['name'],
// 数据来源配置
'sourceFriends' => isset($param['friends']) ? json_encode($param['friends']) : '[]', // 选择的微信好友
'sourceGroups' => isset($param['groups']) ? json_encode($param['groups']) : '[]', // 选择的微信群
// 关键词配置
'keywordInclude' => isset($param['keywordInclude']) ? json_encode($param['keywordInclude']) : '[]', // 包含的关键词
'keywordExclude' => isset($param['keywordExclude']) ? json_encode($param['keywordExclude']) : '[]', // 排除的关键词
// AI配置
'aiEnabled' => isset($param['aiEnabled']) ? $param['aiEnabled'] : 0, // 是否启用AI
'aiPrompt' => isset($param['aiPrompt']) ? $param['aiPrompt'] : '', // AI提示词
// 时间配置
'timeEnabled' => isset($param['timeEnabled']) ? $param['timeEnabled'] : 0, // 是否启用时间限制
'timeStart' => isset($param['startTime']) ? strtotime($param['startTime']) : 0, // 开始时间（转换为时间戳）
'timeEnd' => isset($param['endTime']) ? strtotime($param['endTime']) : 0, // 结束时间（转换为时间戳）
// 来源类型
'sourceType' => isset($param['sourceType']) ? $param['sourceType'] : 0, // 1=好友，2=群，3=好友和群
// 基础信息
'status' => isset($param['status']) ? $param['status'] : 0, // 状态：0=禁用，1=启用
'userId' => $this->request->userInfo['id'],
'companyId' => $this->request->userInfo['companyId'],
'createTime' => time(),
'updateTime' => time()
];
// 创建内容库
$library = new ContentLibrary;
$library->name = $param['name'];
$library->description = isset($param['description']) ? $param['description'] : '';
$library->userId = $this->request->userInfo['id'];
$library->companyId = $this->request->userInfo['companyId'];
$library->save();
$result = $library->save($data);
// 如果有内容项目，也一并创建
if (!empty($param['items']) && is_array($param['items'])) {
foreach ($param['items'] as $item) {
$contentItem = new ContentItem;
$contentItem->libraryId = $library->id;
$contentItem->type = $item['type'];
$contentItem->title = $item['title'] ?? '';
$contentItem->contentData = $item['contentData'];
$contentItem->save();
}
if (!$result) {
Db::rollback();
return json(['code' => 500, 'msg' => '创建内容库失败']);
}
Db::commit();
@@ -177,36 +228,33 @@ class ContentLibraryController extends Controller
/**
* 删除内容库
* @param int $id 内容库ID
* @return \think\response\Json
*/
public function delete($id)
public function delete()
{
$id = $this->request->param('id', 0);
if (empty($id)) {
return json(['code' => 400, 'msg' => '参数错误']);
}
$library = ContentLibrary::where([
['id', '=', $id],
['userId', '=', $this->request->userInfo['id']]
['userId', '=', $this->request->userInfo['id']],
['isDel', '=', 0] // 只删除未删除的记录
])->find();
if (!$library) {
if (empty($library)) {
return json(['code' => 404, 'msg' => '内容库不存在']);
}
Db::startTrans();
try {
// 删除相关内容项目
ContentItem::where('libraryId', $id)->delete();
// 删除内容库
$library->delete();
// 软删除
$library->isDel = 1;
$library->deleteTime = time();
$library->save();
Db::commit();
return json(['code' => 200, 'msg' => '删除成功']);
} catch (\Exception $e) {
Db::rollback();
return json(['code' => 500, 'msg' => '删除失败：' . $e->getMessage()]);
}
}

6
Server/application/store/controller/BaseController.php
View File

@@ -35,10 +35,10 @@ class BaseController extends Api
$device = Cache::get($cacheKey);
// 如果缓存不存在，则从数据库获取
if (!$device) {
$device = Db::table('ck_device_user')
$device = Db::name('device_user')
->alias('du')
->join('s2_device d', 'd.id = du.deviceId','left')
->join('s2_wechat_account wa', 'd.id = wa.currentDeviceId','left')
->join(['s2_device' => 'd'], 'd.id = du.deviceId','left')
->join(['s2_wechat_account' => 'wa'], 'd.id = wa.currentDeviceId','left')
->where([
'du.userId' => $this->userInfo['id'],
'du.companyId' => $this->userInfo['companyId']

8
Server/application/store/controller/CustomerController.php
View File

@@ -54,11 +54,11 @@ class CustomerController extends Api
// }
// 构建查询
$query = Db::table('ck_device_user')
$query = Db::name('device_user')
->alias('du')
->join('s2_device d', 'd.id = du.deviceId','left')
->join('s2_wechat_account wa', 'wa.imei = d.imei','left')
->join('s2_wechat_friend wf', 'wf.ownerWechatId = wa.wechatId','left')
->join(['s2_device' => 'd'], 'd.id = du.deviceId','left')
->join(['s2_wechat_account' => 'wa'], 'wa.imei = d.imei','left')
->join(['s2_wechat_friend' => 'wf'], 'wf.ownerWechatId = wa.wechatId','left')
->where($where)
->field('d.id as deviceId,d.imei,wf.*')
->group('wf.wechatId'); // 防止重复数据

2
Server/application/store/model/WechatFriendModel.php
View File

@@ -6,6 +6,6 @@ use think\Model;
class WechatFriendModel extends Model
{
protected $table = 'ck_wechat_friend';
protected $table = 's2_wechat_friend';
}

2
Server/application/store/model/WechatMessageModel.php
View File

@@ -6,6 +6,6 @@ use think\Model;
class WechatMessageModel extends Model
{
protected $table = 'ck_wechat_message';
protected $table = 's2_wechat_message';
}