分配数量
diff --git a/Cunkebao/src/pages/mobile/workspace/contact-import/list/data.ts b/Cunkebao/src/pages/mobile/workspace/contact-import/list/data.ts
index 33986379..a813afd2 100644
--- a/Cunkebao/src/pages/mobile/workspace/contact-import/list/data.ts
+++ b/Cunkebao/src/pages/mobile/workspace/contact-import/list/data.ts
@@ -35,7 +35,7 @@ export interface ContactImportTaskConfig {
id: number;
workbenchId: number;
devices: number[];
- pools: number[];
+ poolGroups: number[];
num: number;
clearContact: number;
remarkType: number;
@@ -77,7 +77,7 @@ export interface CreateContactImportTaskData {
type: number;
config: {
devices: number[];
- pools: number[];
+ poolGroups: number[];
num: number;
clearContact: number;
remarkType: number;
diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/form/data.ts b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/form/data.ts
index 20b45fe6..ab82999f 100644
--- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/form/data.ts
+++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/form/data.ts
@@ -27,7 +27,7 @@ export interface TrafficDistributionConfig {
accountGroupsOptions: any[];
deviceGroups: any[];
deviceGroupsOptions: any[];
- pools: any[];
+ poolGroups: any[];
exp: number;
createTime: string;
updateTime: string;
@@ -58,7 +58,7 @@ export interface TrafficDistributionFormData {
deviceGroupsOptions: any[];
accountGroups: any[];
accountGroupsOptions: any[];
- pools: any[];
+ poolGroups: any[];
enabled: boolean;
}
diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/form/index.tsx b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/form/index.tsx
index 7d6f21b1..b18da0a7 100644
--- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/form/index.tsx
+++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/form/index.tsx
@@ -1,15 +1,5 @@
-import React, { useState, useEffect } from "react";
-import {
- Form,
- Input,
- Button,
- Radio,
- Slider,
- TimePicker,
- message,
- Checkbox,
-} from "antd";
-import { SearchOutlined } from "@ant-design/icons";
+import React, { useState, useEffect, useCallback } from "react";
+import { Form, Input, Button, Radio, Slider, TimePicker, message } from "antd";
import { useNavigate, useParams } from "react-router-dom";
import style from "./index.module.scss";
import StepIndicator from "@/components/StepIndicator";
@@ -19,38 +9,16 @@ import AccountSelection from "@/components/AccountSelection";
import { AccountItem } from "@/components/AccountSelection/data";
import DeviceSelection from "@/components/DeviceSelection";
import { DeviceSelectionItem } from "@/components/DeviceSelection/data";
+import PoolSelection from "@/components/PoolSelection";
+import { PoolSelectionItem } from "@/components/PoolSelection/data";
import {
getTrafficDistributionDetail,
updateTrafficDistribution,
createTrafficDistribution,
} from "./api";
-import type {
- TrafficDistributionDetail,
- TrafficDistributionFormData,
-} from "./data";
+import type { TrafficDistributionFormData } from "./data";
import dayjs from "dayjs";
-const scenarioList = [
- { label: "海报获客", value: "poster" },
- { label: "电话获客", value: "phone" },
- { label: "抖音获客", value: "douyin" },
- { label: "小红书获客", value: "xiaohongshu" },
- { label: "微信群获客", value: "weixinqun" },
- { label: "API获客", value: "api" },
- { label: "订单获客", value: "order" },
- { label: "付款码获客", value: "payment" },
-];
-const poolList = [
- {
- id: "pool-1",
- name: "高价值客户池",
- userCount: 156,
- tags: ["高价值", "优先添加"],
- },
- { id: "pool-2", name: "潜在客户池", userCount: 289, tags: ["潜在客户"] },
- { id: "pool-3", name: "新用户池", userCount: 432, tags: ["新用户"] },
-];
-
const stepList = [
{ id: 1, title: "基本信息", subtitle: "基本信息" },
{ id: 2, title: "目标设置", subtitle: "目标设置" },
@@ -73,22 +41,20 @@ const TrafficDistributionForm: React.FC = () => {
const [deviceGroupsOptions, setDeviceGroupsOptions] = useState
([]);
const [accountGroups, setAccountGroups] = useState([]);
const [accountGroupsOptions, setAccountGroupsOptions] = useState([]);
- const [distributeType, setDistributeType] = useState(1);
- const [maxPerDay, setMaxPerDay] = useState(50);
- const [timeType, setTimeType] = useState(1);
- const [timeRange, setTimeRange] = useState(null);
+ // 使用 Form 管理字段，配合 useWatch 读取值
const [loading, setLoading] = useState(false);
const [detailLoading, setDetailLoading] = useState(false);
- const [selectedPools, setSelectedPools] = useState([]);
- const [poolSearch, setPoolSearch] = useState("");
- const [targetSelectionTab, setTargetSelectionTab] = useState<
- "device" | "account"
- >("device");
+ const [poolGroupsOptions, setPoolGroupsOptions] = useState<
+ PoolSelectionItem[]
+ >([]);
- // 编辑时的详情数据
- const [detailData, setDetailData] =
- useState(null);
+ // 编辑时的详情数据（不需要保存整份数据，仅回填表单与本地状态）
+
+ // 监听表单字段变化（antd v5 推荐）
+ const maxPerDay = Form.useWatch("maxPerDay", form);
+ const timeType = Form.useWatch("timeType", form);
+ // const timeRange = Form.useWatch("timeRange", form);
// 生成默认名称
const generateDefaultName = () => {
@@ -98,20 +64,12 @@ const TrafficDistributionForm: React.FC = () => {
return `流量分发 ${dateStr} ${timeStr}`;
};
- // 获取详情数据
- useEffect(() => {
- if (isEdit && id) {
- fetchDetail();
- }
- }, [isEdit, id]);
-
- const fetchDetail = async () => {
+ const fetchDetail = useCallback(async () => {
if (!id) return;
setDetailLoading(true);
try {
const detail = await getTrafficDistributionDetail(id);
- setDetailData(detail);
// 回填表单数据
const config = detail.config;
@@ -122,11 +80,6 @@ const TrafficDistributionForm: React.FC = () => {
timeType: config.timeType,
});
- // 设置状态
- setDistributeType(config.distributeType);
- setMaxPerDay(config.maxPerDay);
- setTimeType(config.timeType);
-
// 设置账号组数据
setAccountGroups(config.accountGroups || []);
setAccountGroupsOptions(config.accountGroupsOptions || []);
@@ -136,6 +89,8 @@ const TrafficDistributionForm: React.FC = () => {
setDeviceGroups(config.deviceGroups || []);
setDeviceGroupsOptions(config.deviceGroupsOptions || []);
setSelectedDevices(config.deviceGroupsOptions || []);
+ //设置流量池
+ setPoolGroupsOptions(config.poolGroupsOptions || []);
// 设置时间范围 - 使用dayjs格式
if (config.timeType === 2 && config.startTime && config.endTime) {
@@ -147,22 +102,37 @@ const TrafficDistributionForm: React.FC = () => {
// 使用dayjs创建时间对象
const startTime = dayjs().hour(startHour).minute(startMinute).second(0);
const endTime = dayjs().hour(endHour).minute(endMinute).second(0);
- setTimeRange([startTime, endTime]);
+ form.setFieldsValue({ timeRange: [startTime, endTime] });
}
- // 设置流量池
- setSelectedPools(config.pools.map((pool: any) => pool.id || pool));
+ // 设置流量池 - 交由 PoolSelection 控件受控
} catch (error) {
console.error("获取详情失败:", error);
message.error("获取详情失败");
} finally {
setDetailLoading(false);
}
+ }, [id, form]);
+
+ // 获取详情数据
+ useEffect(() => {
+ if (isEdit && id) {
+ fetchDetail();
+ }
+ }, [isEdit, id, fetchDetail]);
+ const handleFinish = async () => {
+ form.submit();
};
- const handleFinish = async (values?: any) => {
+ const handleFinish2 = async (values?: any) => {
setLoading(true);
try {
+ // 校验流量池至少选择一个
+ if (!poolGroupsOptions || poolGroupsOptions.length === 0) {
+ message.error("请至少选择一个流量池");
+ setLoading(false);
+ return;
+ }
// 如果没有传递values参数，从表单中获取
const formValues = values || form.getFieldsValue();
@@ -173,18 +143,22 @@ const TrafficDistributionForm: React.FC = () => {
source: "",
sourceIcon: "",
description: "",
- distributeType: distributeType,
- maxPerDay: maxPerDay,
- timeType: timeType,
+ distributeType: formValues.distributeType,
+ maxPerDay: formValues.maxPerDay,
+ timeType: formValues.timeType,
startTime:
- timeType === 2 && timeRange?.[0] ? timeRange[0].format("HH:mm") : "",
+ formValues.timeType === 2 && formValues.timeRange?.[0]
+ ? formValues.timeRange[0].format("HH:mm")
+ : "",
endTime:
- timeType === 2 && timeRange?.[1] ? timeRange[1].format("HH:mm") : "",
- deviceGroups: deviceGroups,
+ formValues.timeType === 2 && formValues.timeRange?.[1]
+ ? formValues.timeRange[1].format("HH:mm")
+ : "",
+ deviceGroups: deviceGroupsOptions.map(v => v.id),
deviceGroupsOptions: deviceGroupsOptions,
- accountGroups: accountGroups,
+ accountGroups: accountGroupsOptions.map(v => v.id),
accountGroupsOptions: accountGroupsOptions,
- pools: selectedPools,
+ poolGroups: poolGroupsOptions.map(v => v.id),
enabled: true,
};
@@ -216,15 +190,26 @@ const TrafficDistributionForm: React.FC = () => {
.catch(() => {
// 验证失败，不进行下一步
});
+ } else if (current === 1) {
+ // 第二步：目标设置至少需要选择设备或客服之一
+ const hasDevice =
+ Array.isArray(selectedDevices) && selectedDevices.length > 0;
+ if (!hasDevice) {
+ message.error("请至少选择一个设备");
+ return;
+ }
+ setCurrent(cur => cur + 1);
} else {
setCurrent(cur => cur + 1);
}
};
const prev = () => setCurrent(cur => cur - 1);
- // 过滤流量池
- const filteredPools = poolList.filter(pool => pool.name.includes(poolSearch));
+ const handPoolAction = params => {
+ setPoolGroupsOptions(params);
+ };
+ // 移除未使用的输入同步函数
return (
{
>
+
+
+
+ 全天分配
+ 自定义时间段
+
+
+ {timeType === 2 && (
+
({
+ validator(_, value) {
+ if (getFieldValue("timeType") === 1) {
+ return Promise.resolve();
+ }
+ if (value && value.length === 2) {
+ return Promise.resolve();
+ }
+ return Promise.reject(new Error("请选择开始和结束时间"));
+ },
+ }),
+ ]}
+ >
+
-
- 限制每天最多分配的流量数量
-
-
- setTimeType(e.target.value)}
- className={style.radioGroup}
- >
- 全天分配
- 自定义时间段
-
-
- {timeType === 2 && (
-
-
-
- 开始时间
- setTimeRange([v, timeRange?.[1]])}
- />
-
-
- 结束时间
- setTimeRange([timeRange?.[0], v])}
- />
-
-
- )}
-
- )}
+ )}
+
+
客服选择
+
+
{
+ setAccountGroupsOptions(accounts);
+ }}
+ placeholder="请选择客服"
+ showSelectedList={true}
+ selectedListMaxHeight={300}
+ accountGroups={accountGroups}
+ />
+
+
{current === 1 && (
目标设置
-
- {/* Tab 切换 */}
-
-
-
setTargetSelectionTab("device")}
- >
- 设备选择
-
-
setTargetSelectionTab("account")}
- >
- 客服选择
-
-
-
-
- {/* Tab 内容 */}
-
- {targetSelectionTab === "device" && (
-
- {
- setSelectedDevices(devices);
- setDeviceGroupsOptions(devices);
- }}
- placeholder="请选择设备"
- showSelectedList={true}
- selectedListMaxHeight={300}
- deviceGroups={deviceGroups}
- />
-
- )}
- {targetSelectionTab === "account" && (
-
-
{
- setSelectedAccounts(accounts);
- setAccountGroupsOptions(accounts);
- }}
- placeholder="请选择客服"
- showSelectedList={true}
- selectedListMaxHeight={300}
- accountGroups={accountGroups}
- />
-
- )}
+
+ {
+ setSelectedDevices(devices);
+ setDeviceGroupsOptions(devices);
+ }}
+ placeholder="请选择设备"
+ showSelectedList={true}
+ selectedListMaxHeight={300}
+ deviceGroups={deviceGroups}
+ />
)}
{current === 2 && (
-
-
流量池选择
-
-
setPoolSearch(e.target.value)}
- style={{ marginBottom: 12 }}
- />
-
- {filteredPools.map(pool => (
-
- ))}
-
-
- 已选流量池：{selectedPools.length} 个
-
-
-
+
)}
diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/api.ts b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/api.ts
index 67d4ba32..fddb19bc 100644
--- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/api.ts
+++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/api.ts
@@ -24,7 +24,7 @@ export function toggleDistributionRuleStatus(
// 删除计划
export function deleteDistributionRule(id: number): Promise {
- return request("/v1/workbench/delete", { id }, "POST");
+ return request("/v1/workbench/delete", { id }, "DELETE");
}
// 获取流量分发规则详情
diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/data.ts b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/data.ts
index f9c7a478..d7826493 100644
--- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/data.ts
+++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/data.ts
@@ -113,7 +113,7 @@ export interface DistributionRule {
endTime: string;
account: (string | number)[];
devices: string[];
- pools: string[];
+ poolGroups: string[];
exp: number;
createTime: string;
updateTime: string;
diff --git a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx
index f94f54ba..1a220b6f 100644
--- a/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx
+++ b/Cunkebao/src/pages/mobile/workspace/traffic-distribution/list/index.tsx
@@ -272,7 +272,7 @@ const TrafficDistributionList: React.FC = () => {
onClick={() => showPoolList(item)}
>
- {item.config?.pools?.length || 0}
+ {item.config?.poolGroups?.length || 0}
流量池
diff --git a/Server/application/ai/controller/DouBaoAI.php b/Server/application/ai/controller/DouBaoAI.php
index 18012dbb..e7a50646 100644
--- a/Server/application/ai/controller/DouBaoAI.php
+++ b/Server/application/ai/controller/DouBaoAI.php
@@ -28,32 +28,25 @@ class DouBaoAI
}
- public function text()
+
+ public function text($params = [])
{
$this->__init();
-
- $content = input('content','');
- if (empty($content)){
+ if (empty($params)){
return json_encode(['code' => 500, 'msg' => '提示词缺失']);
}
-
- // 发送请求
- $params = [
- 'model' => 'doubao-1-5-pro-32k-250115',
- 'messages' => [
- ['role' => 'system', 'content' => '你是人工智能助手.'],
- ['role' => 'user', 'content' => $content],
- ],
- /*'extra_headers' => [
- 'x-is-encrypted' => true
- ],
- 'temperature' => 1,
- 'top_p' => 0.7,
- 'max_tokens' => 4096,
- 'frequency_penalty' => 0,*/
- ];
$result = requestCurl($this->apiUrl, $params, 'POST', $this->headers, 'json');
$result = json_decode($result, true);
- return successJson($result);
+ if(isset($result['error'])){
+ $error = $result['error'];
+ return json_encode(['code' => 500, 'msg' => $error['message']]);
+ }else{
+ $content = $result['choices'][0]['message']['content'];
+ $token = intval($result['usage']['total_tokens']) * 20;
+ return json_encode(['code' => 200, 'msg' => '成功','data' => ['token' => $token,'content' => $content]]);
+ }
+
}
+
+
}
\ No newline at end of file
diff --git a/Server/application/chukebao/config/route.php b/Server/application/chukebao/config/route.php
index 1384ac63..090ddec1 100644
--- a/Server/application/chukebao/config/route.php
+++ b/Server/application/chukebao/config/route.php
@@ -16,6 +16,7 @@ Route::group('v1/', function () {
//群相关
Route::group('wechatChatroom/', function () {
Route::get('list', 'app\chukebao\controller\WechatChatroomController@getList'); // 获取好友列表
+ Route::post('aiAnnouncement', 'app\chukebao\controller\WechatChatroomController@aiAnnouncement'); // AI群公告
});
//客服相关
@@ -26,8 +27,62 @@ Route::group('v1/', function () {
//客服相关
Route::group('message/', function () {
Route::get('list', 'app\chukebao\controller\MessageController@getList'); // 获取好友列表
+ Route::get('readMessage', 'app\chukebao\controller\MessageController@readMessage'); // 读取消息
+ Route::get('details', 'app\chukebao\controller\MessageController@details'); // 消息详情
});
+ //AI相关
+ Route::group('ai/', function () {
+ //问答
+ Route::group('questions/', function () {
+ Route::get('list', 'app\chukebao\controller\QuestionsController@getList'); // 问答列表
+ Route::post('add', 'app\chukebao\controller\QuestionsController@create'); // 问答添加
+ Route::post('update', 'app\chukebao\controller\QuestionsController@update'); // 问答更新
+ Route::get('delete', 'app\chukebao\controller\QuestionsController@delete'); // 问答删除
+ Route::get('detail', 'app\chukebao\controller\QuestionsController@detail'); // 问答详情
+ });
+
+ //全局配置
+ Route::group('settings/', function () {
+ Route::get('get', 'app\chukebao\controller\AiSettingsController@getSetting');
+ Route::post('set', 'app\chukebao\controller\AiSettingsController@setSetting');
+ });
+
+ //好友配置
+ Route::group('friend/', function () {
+ Route::post('set', 'app\chukebao\controller\AiSettingsController@setFriend');
+ Route::get('get', 'app\chukebao\controller\AiSettingsController@getFriend');
+ Route::post('setAll', 'app\chukebao\controller\AiSettingsController@setAllFriend');
+ });
+
+
+ //ai对话
+ Route::get('getUserTokens', 'app\chukebao\controller\AiSettingsController@getUserTokens');
+ Route::post('chat', 'app\chukebao\controller\AiChatController@index');
+
+ });
+
+
+ //代办事项
+ Route::group('todo/', function () {
+ Route::get('list', 'app\chukebao\controller\ToDoController@getList');
+ Route::post('add', 'app\chukebao\controller\ToDoController@create');
+ Route::get('process', 'app\chukebao\controller\ToDoController@process');
+ });
+
+
+ //跟进提醒
+ Route::group('followUp/', function () {
+ Route::get('list', 'app\chukebao\controller\FollowUpController@getList');
+ Route::post('add', 'app\chukebao\controller\FollowUpController@create');
+ Route::get('process', 'app\chukebao\controller\FollowUpController@process');
+ });
+
+
+ //算力相关
+ Route::group('tokensRecord/', function () {
+ Route::get('list', 'app\chukebao\controller\TokensRecordController@getList');
+ });
});
diff --git a/Server/application/chukebao/controller/AiChatController.php b/Server/application/chukebao/controller/AiChatController.php
new file mode 100644
index 00000000..c488a1ad
--- /dev/null
+++ b/Server/application/chukebao/controller/AiChatController.php
@@ -0,0 +1,106 @@
+getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+ $friendId = $this->request->param('friendId', '');
+ $wechatAccountId = $this->request->param('wechatAccountId', '');
+ $content = $this->request->param('content', '');
+
+ if (empty($wechatAccountId) || empty($friendId)){
+ return ResponseHelper::error('参数缺失');
+ }
+
+ $tokens = Db::name('users')
+ ->where('id', $userId)
+ ->where('companyId', $companyId)
+ ->value('tokens');
+ if ($tokens <= 0){
+ return ResponseHelper::error('用户Tokens余额不足');
+ }
+
+
+ //读取AI配置
+ $setting = Db::name('ai_settings')->where(['companyId' => $companyId,'userId' => $userId])->find();
+ if(empty($setting)){
+ return ResponseHelper::error('未找到配置信息，请先配置AI策略');
+ }
+ $config = json_decode($setting['config'],true);
+ $modelSetting = $config['modelSetting'];
+ $round = isset($config['round']) ? $config['round'] : 10;
+
+
+ // 导出聊天
+ $messages = Db::table('s2_wechat_message')
+ ->where('wechatFriendId', $friendId)
+ ->order('wechatTime desc')
+ ->field('id,content,msgType,isSend,wechatTime')
+ ->limit($round)
+ ->select();
+
+ usort($messages, function($a, $b) {
+ return $a['wechatTime'] <=> $b['wechatTime'];
+ });
+
+ //处理聊天数据
+ $msg = [];
+ foreach ($messages as $val){
+ if (empty($val['content'])){
+ continue;
+ }
+ if (!empty($val['isSend'])){
+ $msg[] = '客服：' . $val['content'];
+ }else{
+ $msg[] = '用户：' . $val['content'];
+ }
+ }
+ $content = implode("\n", $msg);
+
+
+ $params = [
+ 'model' => 'doubao-1-5-pro-32k-250115',
+ 'messages' => [
+ // ['role' => 'system', 'content' => '请完成跟客户的对话'],
+ ['role' => 'system', 'content' => '角色设定：' . $modelSetting['role']],
+ ['role' => 'system', 'content' => '公司背景：' . $modelSetting['businessBackground']],
+ ['role' => 'system', 'content' => '对话风格：' . $modelSetting['dialogueStyle']],
+ ['role' => 'user', 'content' => $content],
+ ],
+ ];
+
+ //AI处理
+ $ai = new DouBaoAI();
+ $res = $ai->text($params);
+ $res = json_decode($res,true);
+
+ if ($res['code'] == 200) {
+ //扣除Tokens
+ $tokensRecord = new tokensRecord();
+ $nickname = Db::table('s2_wechat_friend')->where(['id' => $friendId])->value('nickname');
+ $remarks = !empty($nickname) ? '与好友【'.$nickname.'】聊天' : '与好友聊天';
+ $data = [
+ 'tokens' => $res['data']['token'],
+ 'type' => 0,
+ 'form' => 1,
+ 'wechatAccountId' => $wechatAccountId,
+ 'friendIdOrGroupId' => $friendId,
+ 'remarks' => $remarks,
+ ];
+ $tokensRecord->consumeTokens($data);
+ return ResponseHelper::success($res['data']['content']);
+ }else{
+ return ResponseHelper::error($res['msg']);
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/Server/application/chukebao/controller/AiSettingsController.php b/Server/application/chukebao/controller/AiSettingsController.php
new file mode 100644
index 00000000..e9c9b1ae
--- /dev/null
+++ b/Server/application/chukebao/controller/AiSettingsController.php
@@ -0,0 +1,270 @@
+ false,
+ 'round' => 10,
+ 'aiStopSetting' => [
+ 'status' => true,
+ 'key' => ['好', '不错', '好的', '下次', '可以']
+ ],
+ 'fileSetting' => [
+ 'type' => 1,
+ 'content' => ''
+ ],
+ 'modelSetting' => [
+ 'model' => 'GPT-4',
+ 'role' => '你是一名销售的AI助理，同时也是一个工智能技术专家，你的名字叫小灵，你是单身女性，出生于2003年10月10日，喜欢听音乐和看电影有着丰富的人生阅历，前成熟大方，分享用幽默风趣的语言和客户交流，顾客问起你的感情，回复内容中不要使用号，特别注意不要跟客户问题，不要更多选择发送的信息。',
+ 'businessBackground' => '灵销智能公司开发了多款AI营销智能技术产品，以提升销售GPT AI大模型为核心，接入打造的销售/营销/客服等AI智能应用，为企业AI办公，AI助理，AI销售，AI营销，AI直播等大AI应用产品。',
+ 'dialogueStyle' => '客户：你们的AI解决方案具体是怎么收费的？销售：嗯，朋友，我们的AI解决方案是根据项目需求来定的，这样吧，你能跟我说说你们的具体情况吗，不过这样一分钱，您看怎么样？我们可以给您做个详细的方案对比。',
+ ]
+ ];
+
+ const TYPE_DATA = ['audioSetting', 'round', 'aiStopSetting', 'fileSetting', 'modelSetting'];
+
+ /**
+ * 获取配置信息
+ * @return \think\response\Json
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\ModelNotFoundException
+ * @throws \think\exception\DbException
+ */
+ public function getSetting()
+ {
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ $data = Db::name('ai_settings')->where(['userId' => $userId, 'companyId' => $companyId])->find();
+ if (empty($data)) {
+ $setting = self::SETTING_DEFAULT;
+ $data = [
+ 'companyId' => $companyId,
+ 'userId' => $userId,
+ 'config' => json_encode($setting, 256),
+ 'createTime' => time(),
+ 'updateTime' => time()
+ ];
+ Db::name('ai_settings')->insert($data);
+
+ } else {
+ $setting = json_decode($data['config'], true);
+ }
+
+ return ResponseHelper::success($setting, '获取成功');
+ }
+
+
+ /**
+ * 配置
+ * @return \think\response\Json
+ * @throws \Exception
+ */
+ public function setSetting()
+ {
+ $key = $this->request->param('key', '');
+ $value = $this->request->param('value', '');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($key) || empty($value)) {
+ return ResponseHelper::error('参数缺失');
+ }
+
+
+ if (!in_array($key, self::TYPE_DATA)) {
+ return ResponseHelper::error('该类型不在配置项');
+ }
+
+ Db::startTrans();
+ try {
+ $data = Db::name('ai_settings')->where(['userId' => $userId, 'companyId' => $companyId])->find();
+ if (empty($data)) {
+ $setting = self::SETTING_DEFAULT;
+ } else {
+ $setting = json_decode($data['config'], true);
+ }
+ $setting[$key] = $value;
+ $setting = json_encode($setting, 256);
+ Db::name('ai_settings')->where(['id' => $data['id']])->update(['config' => $setting, 'updateTime' => time()]);
+ Db::commit();
+ return ResponseHelper::success(' ', '配置成功');
+ } catch (\Exception $e) {
+ Db::rollback();
+ return ResponseHelper::error('配置失败：' . $e->getMessage());
+ }
+ }
+
+
+ public function getUserTokens()
+ {
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+ $tokens = Db::name('users')
+ ->where('id', $userId)
+ ->where('companyId', $companyId)
+ ->value('tokens');
+
+ return ResponseHelper::success($tokens, '获取成功');
+ }
+
+
+
+ public function getFriend()
+ {
+ $friendId = $this->request->param('friendId', '');
+ $wechatAccountId = $this->request->param('wechatAccountId', '');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+ $aiType = AiFriendSettings::where(['userId' => $userId, 'companyId' => $companyId,'friendId' => $friendId,'wechatAccountId' => $wechatAccountId])->value('type');
+ if (empty($aiType)) {
+ $aiType = 0;
+ }
+ return ResponseHelper::success($aiType, '获取成功');
+ }
+
+
+
+
+
+ public function setFriend()
+ {
+ $friendId = $this->request->param('friendId', '');
+ $wechatAccountId = $this->request->param('wechatAccountId', '');
+ $type = $this->request->param('type', 0);
+
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($friendId) || empty($wechatAccountId)) {
+ return ResponseHelper::error('参数缺失');
+ }
+ $friend = Db::table('s2_wechat_friend')->where(['id' => $friendId,'wechatAccountId' => $wechatAccountId])->find();
+
+ if (empty($friend)) {
+ return ResponseHelper::error('该好友不存在');
+ }
+
+ $aiFriendSettings = AiFriendSettings::where(['userId' => $userId, 'companyId' => $companyId,'friendId' => $friendId,'wechatAccountId' => $wechatAccountId])->find();
+ Db::startTrans();
+ try {
+ if (empty($aiFriendSettings)) {
+ $aiFriendSettings = new AiFriendSettings();
+ $aiFriendSettings->companyId = $companyId;
+ $aiFriendSettings->userId = $userId;
+ $aiFriendSettings->type = $type;
+ $aiFriendSettings->wechatAccountId = $wechatAccountId;
+ $aiFriendSettings->friendId = $friendId;
+ $aiFriendSettings->createTime = time();
+ $aiFriendSettings->updateTime = time();
+ }else{
+ $aiFriendSettings->type = $type;
+ $aiFriendSettings->updateTime = time();
+ }
+ $aiFriendSettings->save();
+ Db::commit();
+ return ResponseHelper::success(' ', '配置成功');
+ } catch (\Exception $e) {
+ Db::rollback();
+ return ResponseHelper::error('配置失败：' . $e->getMessage());
+ }
+
+ }
+
+
+
+
+ public function setAllFriend()
+ {
+ $packageId = $this->request->param('packageId', []);
+ $type = $this->request->param('type', 0);
+ $isUpdata = $this->request->param('isUpdata', 0);
+
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($packageId)) {
+ return ResponseHelper::error('参数缺失');
+ }
+ //列出所有好友
+ $row = Db::name('traffic_source_package_item')->alias('a')
+ ->join('wechat_friendship f','a.identifier = f.wechatId and f.companyId = '.$companyId)
+ ->join(['s2_wechat_account' => 'wa'],'f.ownerWechatId = wa.wechatId')
+ ->whereIn('a.packageId' , $packageId)
+ ->field('f.id as friendId,wa.id as wechatAccountId')
+ ->group('f.id')
+ ->select();
+
+ if (empty($row)) {
+ return ResponseHelper::error('`好友不存在');
+ }
+
+
+
+
+
+
+ // 1000条为一组进行批量处理
+ $batchSize = 1000;
+ $totalRows = count($row);
+
+ for ($i = 0; $i < $totalRows; $i += $batchSize) {
+ $batchRows = array_slice($row, $i, $batchSize);
+ if (!empty($batchRows)) {
+ // 1. 提取当前批次的phone
+ $friendIds = array_column($batchRows, 'friendId');
+ // 2. 批量查询已存在的phone
+ $existingPhones = [];
+ if (!empty($friendIds)) {
+ //强制更新
+ if(!empty($isUpdata)){
+ Db::name('ai_friend_settings')->whereIn('friendId',$friendIds)->update(['type' => $type,'updateTime' => time()]);
+ }
+
+ $existing = Db::name('ai_friend_settings')
+ ->where('companyId', $companyId)
+ ->where('friendId', 'in', $friendIds)
+ ->field('friendId')
+ ->select();
+ $existingPhones = array_column($existing, 'friendId');
+ }
+
+ // 3. 过滤出新数据，批量插入
+ $newData = [];
+ foreach ($batchRows as $row) {
+ if (!empty($friendIds) && !in_array($row['friendId'], $existingPhones)) {
+ $newData[] = [
+ 'companyId' => $companyId,
+ 'userId' => $userId,
+ 'type' => $type,
+ 'wechatAccountId' => $row['wechatAccountId'],
+ 'friendId' => $row['friendId'],
+ 'createTime' => time(),
+ 'updateTime' => time(),
+ ];
+ }
+ }
+ // 4. 批量插入新数据
+ if (!empty($newData)) {
+ Db::name('ai_friend_settings')->insertAll($newData);
+ }
+ }
+ }
+ try {
+ return ResponseHelper::success(' ', '配置成功');
+ } catch (\Exception $e) {
+ return ResponseHelper::error('配置失败：' . $e->getMessage());
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/Server/application/chukebao/controller/FollowUpController.php b/Server/application/chukebao/controller/FollowUpController.php
new file mode 100644
index 00000000..dbefba17
--- /dev/null
+++ b/Server/application/chukebao/controller/FollowUpController.php
@@ -0,0 +1,143 @@
+request->param('page', 1);
+ $limit = $this->request->param('limit', 10);
+ $keyword = $this->request->param('keyword', '');
+ $isRemind = $this->request->param('isRemind', '');
+ $isProcess = $this->request->param('isProcess', '');
+ $type = $this->request->param('type', '');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+
+ $where = [
+ ['companyId','=',$companyId],
+ ['userId' ,'=', $userId]
+ ];
+
+ if ($isRemind != '') {
+ $where[] = ['isRemind','=',$isRemind];
+ }
+ if ($type != '') {
+ $where[] = ['type','=',$type];
+ }
+ if ($isProcess != '') {
+ $where[] = ['isProcess','=',$isProcess];
+ }
+
+ if(!empty($keyword)){
+ $where[] = ['title|description','like','%'.$keyword.'%'];
+ }
+
+ $query = FollowUp::where($where);
+
+ $list = $query->where($where)->page($page,$limit)->order('id desc')->select();
+ $total = $query->count();
+
+ foreach ($list as &$item) {
+ $nickname = Db::table('s2_wechat_friend')->where(['id' => $item['friendId']])->value('nickname');
+ $item['nickname'] = !empty($nickname) ? $nickname : '-';
+ $item['reminderTime'] = date('Y-m-d H:i:s',$item['reminderTime']);
+ }
+ unset($item);
+
+ return ResponseHelper::success(['list'=>$list,'total'=>$total]);
+ }
+
+
+ /**
+ * 添加
+ * @return \think\response\Json
+ * @throws \Exception
+ */
+ public function create(){
+ $type = $this->request->param('type', 0);
+ $title = $this->request->param('title', '');
+ $reminderTime = $this->request->param('reminderTime', '');
+ $description = $this->request->param('description', '');
+ $friendId = $this->request->param('friendId', '');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($title) || empty($reminderTime) || empty($description) || empty($friendId)){
+ return ResponseHelper::error('参数缺失');
+ }
+ $friend = Db::name('wechat_friendship')->where(['id' => $friendId,'companyId' => $companyId])->find();
+ if (empty($friend)) {
+ return ResponseHelper::error('好友不存在');
+ }
+
+
+ Db::startTrans();
+ try {
+ $FollowUp = new FollowUp();
+ $FollowUp->type = $type;
+ $FollowUp->title = $title;
+ $FollowUp->friendId = $friendId;
+ $FollowUp->reminderTime = !empty($reminderTime) ? strtotime($reminderTime) : time();
+ $FollowUp->description = $description;
+ $FollowUp->userId = $userId;
+ $FollowUp->companyId = $companyId;
+ $FollowUp->updateTime = time();
+ $FollowUp->createTime = time();
+ $FollowUp->save();
+ Db::commit();
+ return ResponseHelper::success(' ','创建成功');
+ } catch (\Exception $e) {
+ Db::rollback();
+ return ResponseHelper::error('创建失败：'.$e->getMessage());
+ }
+ }
+
+
+ /**
+ * 处理代办事项
+ * @return \think\response\Json
+ * @throws \Exception
+ */
+ public function process(){
+ $ids = $this->request->param('ids','');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($ids)){
+ return ResponseHelper::error('参数缺失');
+ }
+ $ids = explode(',',$ids);
+
+ if (!is_array($ids)){
+ return ResponseHelper::error('格式错误');
+ }
+
+ $FollowUpIds = FollowUp::where(['userId' => $userId,'companyId' => $companyId,'isProcess' => 0])->whereIn('id',$ids)->column('id');
+ if (empty($FollowUpIds)){
+ return ResponseHelper::error('代办事项不存在');
+ }
+
+ Db::startTrans();
+ try {
+ FollowUp::whereIn('id',$FollowUpIds)->update(['isProcess' => 1,'isRemind' => 1,'updateTime' => time()]);
+ Db::commit();
+ return ResponseHelper::success(' ','已处理');
+ } catch (\Exception $e) {
+ Db::rollback();
+ return ResponseHelper::error('处理失败：'.$e->getMessage());
+ }
+
+
+
+
+
+ }
+
+}
\ No newline at end of file
diff --git a/Server/application/chukebao/controller/LoginController.php b/Server/application/chukebao/controller/LoginController.php
index 44a03338..832d055f 100644
--- a/Server/application/chukebao/controller/LoginController.php
+++ b/Server/application/chukebao/controller/LoginController.php
@@ -45,7 +45,9 @@ class LoginController extends Controller
->where(function ($query) use ($username) {
$query->where('account', $username)->whereOr('phone', $username);
})
- ->where('passwordMd5', md5($password))
+ ->where(function ($query2) use ($password) {
+ $query2->where('passwordMd5', md5($password))->whereOr('passwordLocal', localEncrypt($password));
+ })
->find();
}else{
$user = $payload;
@@ -84,9 +86,41 @@ class LoginController extends Controller
$kefuData['self'] = $self;
Db::name('users')->where('id', $user['id'])->update(['passwordLocal' => localEncrypt($params['password']),'updateTime' => time()]);
}else{
- return ResponseHelper::error($result['error_description']);
+ $kefuData = [
+ 'token' => [
+ "access_token"=> "27gINKZqGux6V4j9QLawOcTKlWXg-j4zxQjKvScvDTq-YlLcwIrDP2AFaNZKnOo9zLzepOBC8qrdXh4z9GxxkwE9TKGRQI1FjITRlMZzrim13IbSEbJUoywGs_BhDmIZnnPhfjqxDB1vjZgVtT2Kp4bxbUCV3i2uO_FTv_DT2G7NUFFLjq8oIuUrd_c1YXeYkH8m8Fw1AM4yPZJZyfdaHSSMOpJ2Bk2LAghnB6OaZCYWNFQcwWARsmh1BSAANUOAoadjkztZC7Fme-GGOm2sLo0WL6Mf26NfeLmnkluewTiPMyacD7RYclAR2LZ_8Mhwr3pwRg",
+ "token_type"=> "bearer",
+ "expires_in"=> 195519999,
+ "refresh_token"=> "a9545daa-d1c4-4c87-8c4c-b713631d4f0d"
+ ],
+ 'self' => [
+ 'account' => [
+ "id"=> 5538,
+ "realName"=> "测试",
+ "nickname"=> "",
+ "memo"=> "",
+ "avatar"=> "",
+ "userName"=> "wz_02",
+ "secret"=> "8f6f743395ad4198b6a4c0e6ca0e452f",
+ "accountType"=> 10,
+ "departmentId"=> 2130,
+ "useGoogleSecretKey"=> false,
+ "hasVerifyGoogleSecret"=> true
+ ],
+ 'tenant' => [
+ "id" => 242,
+ "name"=> "泉州市卡若网络技术有限公司",
+ "guid"=> "5E2C38F5A275450D935F3ECEC076124E",
+ "thirdParty"=> null,
+ "tenantType"=> 0,
+ "deployName"=> "deploy-s2"
+ ]
+ ]
+ ];
+ //return ResponseHelper::error($result['error_description']);
}
+
unset($user['passwordMd5'],$user['deleteTime']);
$userData['member'] = $user;
diff --git a/Server/application/chukebao/controller/MessageController.php b/Server/application/chukebao/controller/MessageController.php
index c213b7e8..beffd1ed 100644
--- a/Server/application/chukebao/controller/MessageController.php
+++ b/Server/application/chukebao/controller/MessageController.php
@@ -53,6 +53,9 @@ class MessageController extends BaseController
->field('id,nickname,avatar')
->find();
$v['msgInfo'] = $friend;
+ $v['unreadCount'] = Db::table('s2_wechat_message')
+ ->where(['wechatFriendId' => $v['wechatFriendId'],'isRead' => 0])
+ ->count();
}
if (!empty($v['wechatChatroomId'])){
@@ -61,12 +64,87 @@ class MessageController extends BaseController
->field('id,nickname,chatroomAvatar as avatar')
->find();
$v['msgInfo'] = $chatroom;
+ $v['unreadCount'] = Db::table('s2_wechat_message')
+ ->where(['wechatChatroomId' => $v['wechatChatroomId'],'isRead' => 0])
+ ->count();
}
-
}
unset($v);
return ResponseHelper::success($list);
}
+
+
+ public function readMessage(){
+ $wechatFriendId = $this->request->param('wechatFriendId', '');
+ $wechatChatroomId = $this->request->param('wechatChatroomId', '');
+ $accountId = $this->getUserInfo('s2_accountId');
+ if (empty($accountId)){
+ return ResponseHelper::error('请先登录');
+ }
+ if (empty($wechatChatroomId) && empty($wechatFriendId)){
+ return ResponseHelper::error('参数缺失');
+ }
+
+ $where = [];
+ if (!empty($wechatChatroomId)){
+ $where[] = ['wechatChatroomId','=',$wechatChatroomId];
+ }
+
+ if (!empty($wechatFriendId)){
+ $where[] = ['wechatFriendId','=',$wechatFriendId];
+ }
+
+ Db::table('s2_wechat_message')->where($where)->update(['isRead' => 1]);
+ return ResponseHelper::success([]);
+ }
+
+
+
+
+ public function details(){
+ $wechatFriendId = $this->request->param('wechatFriendId', '');
+ $wechatChatroomId = $this->request->param('wechatChatroomId', '');
+ $wechatAccountId = $this->request->param('wechatAccountId', '');
+ $page = $this->request->param('page', 1);
+ $limit = $this->request->param('limit', 10);
+ $from = $this->request->param('From', '');
+ $to = $this->request->param('To', '');
+ $olderData = $this->request->param('olderData', false);
+ $accountId = $this->getUserInfo('s2_accountId');
+ if (empty($accountId)){
+ return ResponseHelper::error('请先登录');
+ }
+ if (empty($wechatChatroomId) && empty($wechatFriendId)){
+ return ResponseHelper::error('参数缺失');
+ }
+
+ $where = [];
+ if (!empty($wechatChatroomId)){
+ $where[] = ['wechatChatroomId','=',$wechatChatroomId];
+ }
+
+ if (!empty($wechatFriendId)){
+ $where[] = ['wechatFriendId','=',$wechatFriendId];
+ }
+
+ if (!empty($From) && !empty($To)){
+ $where[] = ['wechatTime','between',[$from,$to]];
+ }
+
+
+ $list = Db::table('s2_wechat_message')->where($where)->page($page,$limit)->order('id DESC')->select();
+ $total = Db::table('s2_wechat_message')->where($where)->count();
+
+
+ foreach ($list as $k=>&$v){
+ $v['wechatTime'] = !empty($v['wechatTime']) ? date('Y-m-d H:i:s',$v['wechatTime']) : '';
+ }
+
+
+ return ResponseHelper::success(['total'=>$total,'list'=>$list]);
+ }
+
+
}
\ No newline at end of file
diff --git a/Server/application/chukebao/controller/QuestionsController.php b/Server/application/chukebao/controller/QuestionsController.php
new file mode 100644
index 00000000..9ee8799e
--- /dev/null
+++ b/Server/application/chukebao/controller/QuestionsController.php
@@ -0,0 +1,232 @@
+request->param('page', 1);
+ $limit = $this->request->param('limit', 10);
+ $keyword = $this->request->param('keyword', '');
+ $accountId = $this->getUserInfo('s2_accountId');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($accountId)){
+ return ResponseHelper::error('请先登录');
+ }
+ $query = Questions::where(['userId' => $userId,'companyId' => $companyId,'isDel' => 0])
+ ->order('id desc');
+ if (!empty($keyword)){
+ $query->where('questions|answers', 'like', '%'.$keyword.'%');
+ }
+ $list = $query->page($page, $limit)->select()->toArray();
+ $total = $query->count();
+
+ foreach ($list as $k => &$v){
+ $user = Db::name('users')->where(['id' => $v['userId']])->field('username,account')->find();
+ if (!empty($user)){
+ $v['userName'] = !empty($user['username']) ? $user['username'] : $user['account'];
+ }else{
+ $v['userName'] = '';
+ }
+ $v['answers'] = json_decode($v['answers'],true);
+ }
+ unset($v);
+ return ResponseHelper::success(['list'=>$list,'total'=>$total]);
+ }
+
+
+ /**
+ * 新增
+ * @return \think\response\Json
+ * @throws \Exception
+ */
+ public function create(){
+
+ $type = $this->request->param('type', 0);
+ $questions = $this->request->param('questions', '');
+ $answers = $this->request->param('answers', []);
+ $status = $this->request->param('status', 0);
+ $accountId = $this->getUserInfo('s2_accountId');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($accountId)){
+ return ResponseHelper::error('请先登录');
+ }
+
+ if (empty($questions) || empty($answers)){
+ return ResponseHelper::error('问题和答案不能为空');
+ }
+
+ Db::startTrans();
+ try {
+ $questionsModel = new Questions();
+ $questionsModel->type = $type;
+ $questionsModel->questions = $questions;
+ $questionsModel->answers = !empty($answers) ? json_encode($answers,256) : json_encode([],256);
+ $questionsModel->status = $status;
+ $questionsModel->accountId = $accountId;
+ $questionsModel->userId = $userId;
+ $questionsModel->companyId = $companyId;
+ $questionsModel->createTime = time();
+ $questionsModel->updateTime = time();
+ $questionsModel->save();
+ Db::commit();
+ return ResponseHelper::success(' ','创建成功');
+ } catch (\Exception $e) {
+ Db::rollback();
+ return ResponseHelper::error('创建失败：'.$e->getMessage());
+ }
+ }
+
+
+ /**
+ * 更新
+ * @return \think\response\Json
+ * @throws \Exception
+ */
+ public function update(){
+
+ $id = $this->request->param('id', 0);
+ $accountId = $this->getUserInfo('s2_accountId');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+ $type = $this->request->param('type', 0);
+ $questions = $this->request->param('questions', '');
+ $answers = $this->request->param('answers', []);
+ $status = $this->request->param('status', 0);
+ $accountId = $this->getUserInfo('s2_accountId');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($accountId)){
+ return ResponseHelper::error('请先登录');
+ }
+
+ if (empty($id)){
+ return ResponseHelper::error('参数缺失');
+ }
+
+ if (empty($questions) || empty($answers)){
+ return ResponseHelper::error('问题和答案不能为空');
+ }
+ Db::startTrans();
+ try {
+ $questionsData = Questions::where(['id' => $id,'userId' => $userId,'companyId' => $companyId,'isDel' => 0])->find();
+ $questionsData->type = $type;
+ $questionsData->questions = $questions;
+ $questionsData->answers = !empty($answers) ? json_encode($answers,256) : json_encode([],256);
+ $questionsData->status = $status;
+ $questionsData->accountId = $accountId;
+ $questionsData->userId = $userId;
+ $questionsData->companyId = $companyId;
+ $questionsData->updateTime = time();
+ $questionsData->save();
+ Db::commit();
+ return ResponseHelper::success(' ','更新成功');
+ } catch (\Exception $e) {
+ Db::rollback();
+ return ResponseHelper::error('更新失败：'.$e->getMessage());
+ }
+ }
+
+
+
+
+
+ /**
+ * 删除
+ * @return \think\response\Json
+ * @throws \Exception
+ */
+ public function delete(){
+
+ $id = $this->request->param('id', 0);
+ $accountId = $this->getUserInfo('s2_accountId');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($accountId)){
+ return ResponseHelper::error('请先登录');
+ }
+
+ if (empty($id)){
+ return ResponseHelper::error('参数缺失');
+ }
+ $questions = Questions::where(['id' => $id,'userId' => $userId,'companyId' => $companyId,'isDel' => 0])->find();
+
+ if (empty($questions)){
+ return ResponseHelper::error('该问题不存在或者已删除');
+ }
+ $res = Questions::where(['id' => $id])->update(['isDel' => 1,'deleteTime' => time()]);
+
+ if (!empty($res)){
+ return ResponseHelper::success('','已删除');
+ }else{
+ return ResponseHelper::error('删除失败');
+ }
+
+ }
+
+
+ /**
+ * 详情
+ * @return \think\response\Json
+ * @throws \Exception
+ */
+ public function detail(){
+
+ $id = $this->request->param('id', 0);
+ $accountId = $this->getUserInfo('s2_accountId');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($accountId)){
+ return ResponseHelper::error('请先登录');
+ }
+
+ if (empty($id)){
+ return ResponseHelper::error('参数缺失');
+ }
+ $questions = Questions::where(['id' => $id,'userId' => $userId,'companyId' => $companyId,'isDel' => 0])->find();
+
+ if (empty($questions)){
+ return ResponseHelper::error('该问题不存在或者已删除');
+ }
+
+ $questions['answers'] = json_decode($questions['answers'],true);
+ $user = Db::name('users')->where(['id' => $questions['userId']])->field('username,account')->find();
+ if (!empty($user)){
+ $questions['userName'] = !empty($user['username']) ? $user['username'] : $user['account'];
+ }else{
+ $questions['userName'] = '';
+ }
+
+ unset(
+ $questions['isDel'],
+ $questions['deleteTime'],
+ $questions['createTime'],
+ $questions['updateTime']
+ );
+
+ return ResponseHelper::success($questions,'获取成功');
+
+
+ }
+
+
+
+
+}
\ No newline at end of file
diff --git a/Server/application/chukebao/controller/ToDoController.php b/Server/application/chukebao/controller/ToDoController.php
new file mode 100644
index 00000000..c71ab30b
--- /dev/null
+++ b/Server/application/chukebao/controller/ToDoController.php
@@ -0,0 +1,143 @@
+request->param('page', 1);
+ $limit = $this->request->param('limit', 10);
+ $keyword = $this->request->param('keyword', '');
+ $isRemind = $this->request->param('isRemind', '');
+ $isProcess = $this->request->param('isProcess', '');
+ $level = $this->request->param('level', '');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+
+ $where = [
+ ['companyId','=',$companyId],
+ ['userId' ,'=', $userId]
+ ];
+
+ if ($isRemind != '') {
+ $where[] = ['isRemind','=',$isRemind];
+ }
+ if ($level != '') {
+ $where[] = ['level','=',$level];
+ }
+ if ($isProcess != '') {
+ $where[] = ['isProcess','=',$isProcess];
+ }
+
+ if(!empty($keyword)){
+ $where[] = ['title|description','like','%'.$keyword.'%'];
+ }
+
+ $query = ToDo::where($where);
+
+ $list = $query->where($where)->page($page,$limit)->order('id desc')->select();
+ $total = $query->count();
+
+ foreach ($list as &$item) {
+ $nickname = Db::table('s2_wechat_friend')->where(['id' => $item['friendId']])->value('nickname');
+ $item['nickname'] = !empty($nickname) ? $nickname : '-';
+ $item['reminderTime'] = date('Y-m-d H:i:s',$item['reminderTime']);
+ }
+ unset($item);
+
+ return ResponseHelper::success(['list'=>$list,'total'=>$total]);
+ }
+
+
+ /**
+ * 添加
+ * @return \think\response\Json
+ * @throws \Exception
+ */
+ public function create(){
+ $level = $this->request->param('level', 0);
+ $title = $this->request->param('title', '');
+ $reminderTime = $this->request->param('reminderTime', '');
+ $description = $this->request->param('description', '');
+ $friendId = $this->request->param('friendId', '');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($title) || empty($reminderTime) || empty($description) || empty($friendId)){
+ return ResponseHelper::error('参数缺失');
+ }
+ $friend = Db::name('wechat_friendship')->where(['id' => $friendId,'companyId' => $companyId])->find();
+ if (empty($friend)) {
+ return ResponseHelper::error('好友不存在');
+ }
+
+
+ Db::startTrans();
+ try {
+ $todo = new ToDo();
+ $todo->level = $level;
+ $todo->title = $title;
+ $todo->friendId = $friendId;
+ $todo->reminderTime = !empty($reminderTime) ? strtotime($reminderTime) : time();
+ $todo->description = $description;
+ $todo->userId = $userId;
+ $todo->companyId = $companyId;
+ $todo->updateTime = time();
+ $todo->createTime = time();
+ $todo->save();
+ Db::commit();
+ return ResponseHelper::success(' ','创建成功');
+ } catch (\Exception $e) {
+ Db::rollback();
+ return ResponseHelper::error('创建失败：'.$e->getMessage());
+ }
+ }
+
+
+ /**
+ * 处理代办事项
+ * @return \think\response\Json
+ * @throws \Exception
+ */
+ public function process(){
+ $ids = $this->request->param('ids','');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+ if (empty($ids)){
+ return ResponseHelper::error('参数缺失');
+ }
+ $ids = explode(',',$ids);
+
+ if (!is_array($ids)){
+ return ResponseHelper::error('格式错误');
+ }
+
+ $todoIds = ToDo::where(['userId' => $userId,'companyId' => $companyId,'isProcess' => 0])->whereIn('id',$ids)->column('id');
+ if (empty($todoIds)){
+ return ResponseHelper::error('代办事项不存在');
+ }
+
+ Db::startTrans();
+ try {
+ ToDo::whereIn('id',$todoIds)->update(['isProcess' => 1,'isRemind' => 1,'updateTime' => time()]);
+ Db::commit();
+ return ResponseHelper::success(' ','已处理');
+ } catch (\Exception $e) {
+ Db::rollback();
+ return ResponseHelper::error('处理失败：'.$e->getMessage());
+ }
+
+
+
+
+
+ }
+
+}
\ No newline at end of file
diff --git a/Server/application/chukebao/controller/TokensRecordController.php b/Server/application/chukebao/controller/TokensRecordController.php
new file mode 100644
index 00000000..deb8882d
--- /dev/null
+++ b/Server/application/chukebao/controller/TokensRecordController.php
@@ -0,0 +1,179 @@
+request->param('page', 1);
+ $limit = $this->request->param('limit', 10);
+ $type = $this->request->param('type', '');
+ $form = $this->request->param('form', '');
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+
+
+ $where = [
+ ['companyId','=',$companyId],
+ ['userId' ,'=', $userId]
+ ];
+
+ if ($type != '') {
+ $where[] = ['type','=',$type];
+ }
+ if ($form != '') {
+ $where[] = ['form','=',$form];
+ }
+
+
+ $query = TokensRecord::where($where);
+
+ $list = $query->where($where)->page($page,$limit)->order('id desc')->select();
+ $total = $query->count();
+
+ foreach ($list as &$item) {
+ if (in_array($item['type'],[1])){
+ $nickname = Db::table('s2_wechat_friend')->where(['id' => $item['friendIdOrGroupId']])->value('nickname');
+ $item['nickname'] = !empty($nickname) ? $nickname : '-';
+ }
+ if (in_array($item['type'],[2,3])){
+ $nickname = Db::table('s2_wechat_chatroom')->where(['id' => $item['friendIdOrGroupId']])->value('nickname');
+ $item['nickname'] = !empty($nickname) ? $nickname : '-';
+ }
+ }
+ unset($item);
+
+ return ResponseHelper::success(['list'=>$list,'total'=>$total]);
+ }
+
+
+ public function consumeTokens($data = [])
+ {
+ if (empty($data)){
+ return ResponseHelper::error('数据缺失');
+ }
+
+ $tokens = isset($data['tokens']) ? intval($data['tokens']) : 0;
+ $type = isset($data['type']) ? intval($data['type']) : 0;
+ $form = isset($data['form']) ? intval($data['form']) : 0;
+ $wechatAccountId = isset($data['wechatAccountId']) ? intval($data['wechatAccountId']) : 0;
+ $friendIdOrGroupId = isset($data['friendIdOrGroupId']) ? intval($data['friendIdOrGroupId']) : 0;
+ $remarks = isset($data['remarks']) ? $data['remarks'] : '';
+ $companyId = isset($data['companyId']) ? intval($data['companyId']) : $this->getUserInfo('companyId');
+ $userId = isset($data['userId']) ? intval($data['userId']) : $this->getUserInfo('id');
+
+ // 验证必要参数
+ if ($tokens <= 0) {
+ return ResponseHelper::error('tokens数量必须大于0');
+ }
+
+ if (!in_array($type, [0, 1])) {
+ return ResponseHelper::error('类型参数错误，0为减少，1为增加');
+ }
+
+ if (!in_array($form, [0, 1, 2, 3, 4, 5])) {
+ return ResponseHelper::error('来源参数错误');
+ }
+
+ // 重试机制，最多重试3次
+ $maxRetries = 3;
+ $retryCount = 0;
+ while ($retryCount < $maxRetries) {
+ try {
+ return $this->doConsumeTokens($userId, $companyId, $tokens, $type, $form, $wechatAccountId, $friendIdOrGroupId, $remarks);
+ } catch (\Exception $e) {
+ $retryCount++;
+ if ($retryCount >= $maxRetries) {
+ return ResponseHelper::error('操作失败，请稍后重试：' . $e->getMessage());
+ }
+ // 短暂延迟后重试
+ usleep(100000); // 100ms
+ }
+ }
+ }
+
+ /**
+ * 执行tokens消费的核心方法
+ */
+ private function doConsumeTokens($userId, $companyId, $tokens, $type, $form, $wechatAccountId, $friendIdOrGroupId, $remarks)
+ {
+ // 开启数据库事务
+ Db::startTrans();
+ try {
+ // 使用悲观锁获取用户当前tokens余额，确保并发安全
+ $userInfo = Db::name('users')
+ ->where('id', $userId)
+ ->where('companyId', $companyId)
+ ->lock(true) // 悲观锁，防止并发问题
+ ->find();
+
+ if (!$userInfo) {
+ throw new \Exception('用户不存在');
+ }
+
+ $currentTokens = intval($userInfo['tokens']);
+
+ // 计算新的余额
+ $newBalance = $type == 1 ? ($currentTokens + $tokens) : ($currentTokens - $tokens);
+
+ // 使用原子更新操作，基于当前值进行更新，防止并发覆盖
+ $updateResult = Db::name('users')
+ ->where('id', $userId)
+ ->where('companyId', $companyId)
+ ->where('tokens', $currentTokens) // 确保基于当前值更新
+ ->update([
+ 'tokens' => $newBalance,
+ 'updateTime' => time()
+ ]);
+
+ if (!$updateResult) {
+ // 如果更新失败，说明tokens值已被其他事务修改，需要重新获取
+ throw new \Exception('tokens余额已被其他操作修改，请重试');
+ }
+
+ // 记录tokens变动
+ $recordData = [
+ 'companyId' => $companyId,
+ 'userId' => $userId,
+ 'wechatAccountId' => $wechatAccountId,
+ 'friendIdOrGroupId' => $friendIdOrGroupId,
+ 'form' => $form,
+ 'type' => $type,
+ 'tokens' => $tokens,
+ 'balanceTokens' => $newBalance,
+ 'remarks' => $remarks,
+ 'createTime' => time()
+ ];
+
+ $recordId = Db::name('tokens_record')->insertGetId($recordData);
+
+ if (!$recordId) {
+ throw new \Exception('记录tokens变动失败');
+ }
+
+ // 提交事务
+ Db::commit();
+
+ return ResponseHelper::success([
+ 'recordId' => $recordId,
+ 'oldBalance' => $currentTokens,
+ 'newBalance' => $newBalance,
+ 'changeAmount' => $type == 1 ? $tokens : -$tokens
+ ], 'tokens变动记录成功');
+
+ } catch (\Exception $e) {
+ // 回滚事务
+ Db::rollback();
+ throw $e; // 重新抛出异常，让重试机制处理
+ }
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/Server/application/chukebao/controller/WechatChatroomController.php b/Server/application/chukebao/controller/WechatChatroomController.php
index e6c64f5c..8753da88 100644
--- a/Server/application/chukebao/controller/WechatChatroomController.php
+++ b/Server/application/chukebao/controller/WechatChatroomController.php
@@ -2,6 +2,8 @@
namespace app\chukebao\controller;
+use app\ai\controller\DouBaoAI;
+use app\chukebao\controller\TokensRecordController as tokensRecord;
use library\ResponseHelper;
use think\Db;
@@ -22,12 +24,121 @@ class WechatChatroomController extends BaseController
$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']) : '';
+ // 提取所有聊天室ID，用于批量查询
+ $chatroomIds = array_column($list, 'id');
+
+
+ // 一次性查询所有聊天室的未读消息数量
+ $unreadCounts = [];
+ if (!empty($chatroomIds)) {
+ $unreadResults = Db::table('s2_wechat_message')
+ ->field('wechatChatroomId, COUNT(*) as count')
+ ->where('wechatChatroomId', 'in', $chatroomIds)
+ ->where('isRead', 0)
+ ->group('wechatChatroomId')
+ ->select();
+
+ foreach ($unreadResults as $result) {
+ $unreadCounts[$result['wechatChatroomId']] = $result['count'];
+ }
+ }
+ // 一次性查询所有聊天室的最新消息
+ $latestMessages = [];
+ if (!empty($chatroomIds)) {
+ // 使用子查询获取每个聊天室的最新消息ID
+ $subQuery = Db::table('s2_wechat_message')
+ ->field('MAX(id) as max_id, wechatChatroomId')
+ ->where('wechatChatroomId', 'in', $chatroomIds)
+ ->group('wechatChatroomId')
+ ->buildSql();
+
+ // 查询最新消息的详细信息
+ $messageResults = Db::table('s2_wechat_message')
+ ->alias('m')
+ ->join([$subQuery => 'sub'], 'm.id = sub.max_id')
+ ->field('m.*, sub.wechatChatroomId')
+ ->select();
+
+ foreach ($messageResults as $message) {
+ $latestMessages[$message['wechatChatroomId']] = $message;
+ }
+ }
+
+ // 处理每个聊天室的数据
+ 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']) : '';
+
+ $config = [
+ 'unreadCount' => isset($unreadCounts[$v['id']]) ? $unreadCounts[$v['id']] : 0,
+ 'chat' => isset($latestMessages[$v['id']]),
+ 'msgTime' => isset($latestMessages[$v['id']]) ? $latestMessages[$v['id']]['wechatTime'] : 0
+ ];
+ $v['config'] = $config;
}
unset($v);
return ResponseHelper::success(['list'=>$list,'total'=>$total]);
}
+
+
+
+ public function aiAnnouncement()
+ {
+ $userId = $this->getUserInfo('id');
+ $companyId = $this->getUserInfo('companyId');
+ $wechatAccountId = $this->request->param('wechatAccountId', '');
+ $groupId = $this->request->param('groupId', '');
+ $content = $this->request->param('content', '');
+
+ if (empty($groupId) || empty($content)|| empty($wechatAccountId)){
+ return ResponseHelper::error('参数缺失');
+ }
+
+ $tokens = Db::name('users')
+ ->where('id', $userId)
+ ->where('companyId', $companyId)
+ ->value('tokens');
+ if ($tokens <= 0){
+ return ResponseHelper::error('用户Tokens余额不足');
+ }
+
+ $params = [
+ 'model' => 'doubao-1-5-pro-32k-250115',
+ 'messages' => [
+ ['role' => 'system', 'content' => '你现在是存客宝的AI助理，你精通中国大陆的法律'],
+ ['role' => 'user', 'content' => $content],
+ ],
+ ];
+
+ //AI处理
+ $ai = new DouBaoAI();
+ $res = $ai->text($params);
+ $res = json_decode($res,true);
+
+
+ if ($res['code'] == 200) {
+ //扣除Tokens
+ $tokensRecord = new tokensRecord();
+ $nickname = Db::table('s2_wechat_chatroom')->where(['id' => $groupId])->value('nickname');
+ $remarks = !empty($nickname) ? '生成【'.$nickname.'】群公告' : '生成群公告';
+ $data = [
+ 'tokens' => $res['data']['token'],
+ 'type' => 0,
+ 'form' => 3,
+ 'wechatAccountId' => $wechatAccountId,
+ 'friendIdOrGroupId' => $groupId,
+ 'remarks' => $remarks,
+ ];
+ $tokensRecord->consumeTokens($data);
+ return ResponseHelper::success($res['data']['content']);
+ }else{
+ return ResponseHelper::error($res['msg']);
+ }
+
+
+ exit_data($res);
+
+ }
+
}
\ No newline at end of file
diff --git a/Server/application/chukebao/controller/WechatFriendController.php b/Server/application/chukebao/controller/WechatFriendController.php
index bd8f0095..f73a6ab8 100644
--- a/Server/application/chukebao/controller/WechatFriendController.php
+++ b/Server/application/chukebao/controller/WechatFriendController.php
@@ -22,10 +22,71 @@ class WechatFriendController extends BaseController
$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']) : '';
+ // 提取所有好友ID
+ $friendIds = array_column($list, 'id');
+
+ // 一次性查询所有好友的未读消息数量
+ $unreadCounts = [];
+ if (!empty($friendIds)) {
+ $unreadResults = Db::table('s2_wechat_message')
+ ->field('wechatFriendId, COUNT(*) as count')
+ ->where('wechatFriendId', 'in', $friendIds)
+ ->where('isRead', 0)
+ ->group('wechatFriendId')
+ ->select();
+
+ foreach ($unreadResults as $result) {
+ $unreadCounts[$result['wechatFriendId']] = $result['count'];
+ }
+ }
+
+ // 一次性查询所有好友的最新消息
+ $latestMessages = [];
+ if (!empty($friendIds)) {
+ // 使用子查询获取每个好友的最新消息ID
+ $subQuery = Db::table('s2_wechat_message')
+ ->field('MAX(id) as max_id, wechatFriendId')
+ ->where('wechatFriendId', 'in', $friendIds)
+ ->group('wechatFriendId')
+ ->buildSql();
+
+ // 查询最新消息的详细信息
+ $messageResults = Db::table('s2_wechat_message')
+ ->alias('m')
+ ->join([$subQuery => 'sub'], 'm.id = sub.max_id')
+ ->field('m.*, sub.wechatFriendId')
+ ->select();
+
+ foreach ($messageResults as $message) {
+ $latestMessages[$message['wechatFriendId']] = $message;
+ }
+ }
+
+
+ $aiTypeData = [];
+ if (!empty($friendIds)) {
+ $aiTypeData = Db::name('ai_friend_settings')
+ ->where('friendId', 'in', $friendIds)
+ ->column('friendId,type');
+ }
+
+
+ // 处理每个好友的数据
+ 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']) : '';
+
+
+ $config = [
+ 'unreadCount' => isset($unreadCounts[$v['id']]) ? $unreadCounts[$v['id']] : 0,
+ 'chat' => isset($latestMessages[$v['id']]),
+ 'msgTime' => isset($latestMessages[$v['id']]) ? $latestMessages[$v['id']]['wechatTime'] : 0
+ ];
+
+ // 将消息配置添加到好友数据中
+ $v['config'] = $config;
+ $v['aiType'] = isset($aiTypeData[$v['id']]) ? $aiTypeData[$v['id']] : 0;
}
unset($v);
diff --git a/Server/application/chukebao/model/AiFriendSettings.php b/Server/application/chukebao/model/AiFriendSettings.php
new file mode 100644
index 00000000..de99b4a9
--- /dev/null
+++ b/Server/application/chukebao/model/AiFriendSettings.php
@@ -0,0 +1,17 @@
+setName('clean:expired_group_messages')
+ ->setDescription('Clean expired group messages from the database')
+ ->addOption('days', 'd', Option::VALUE_OPTIONAL, 'Number of days to keep messages (default: 90)', 90)
+ ->addOption('dry-run', null, Option::VALUE_NONE, 'Perform a dry run without deleting any data')
+ ->addOption('batch-size', 'b', Option::VALUE_OPTIONAL, 'Batch size for deletion (default: 1000)', 1000);
+ }
+
+ protected function execute(Input $input, Output $output)
+ {
+ $days = (int)$input->getOption('days');
+ $dryRun = $input->getOption('dry-run');
+ $batchSize = (int)$input->getOption('batch-size');
+
+ if ($dryRun) {
+ $output->writeln("
Running in dry-run mode. No data will be deleted.");
+ }
+
+ $cutoffDate = date('Y-m-d H:i:s', strtotime("-{$days} days"));
+ $output->writeln("
Cleaning group messages older than {$cutoffDate} (keeping last {$days} days)");
+
+ // 清理微信群组消息
+ $this->cleanWechatGroupMessages($cutoffDate, $dryRun, $batchSize, $output);
+
+ $output->writeln("
Group message cleanup completed successfully.");
+ }
+
+ protected function cleanWechatGroupMessages($cutoffDate, $dryRun, $batchSize, Output $output)
+ {
+ $output->writeln("\nCleaning s2_wechat_group_message table...");
+
+ // 获取符合条件的消息总数
+ $totalCount = Db::table('s2_wechat_group_message')
+ ->where('createTime', '<', $cutoffDate)
+ ->count();
+
+ if ($totalCount === 0) {
+ $output->writeln("
No expired group messages found.");
+ return;
+ }
+
+ $output->writeln(" Found {$totalCount} group messages to clean up.");
+
+ if ($dryRun) {
+ $output->writeln("
Dry run mode: would delete {$totalCount} group messages.");
+ return;
+ }
+
+ // 计算需要执行的批次数
+ $batches = ceil($totalCount / $batchSize);
+ $deletedCount = 0;
+
+ $output->writeln(" Deleting in {$batches} batches of {$batchSize} records...");
+
+ // 分批删除数据
+ for ($i = 0; $i < $batches; $i++) {
+ // 获取一批要删除的ID
+ $ids = Db::table('s2_wechat_group_message')
+ ->where('createTime', '<', $cutoffDate)
+ ->limit($batchSize)
+ ->column('id');
+
+ if (empty($ids)) {
+ break;
+ }
+
+ // 删除这批数据
+ $count = Db::table('s2_wechat_group_message')
+ ->whereIn('id', $ids)
+ ->delete();
+
+ $deletedCount += $count;
+ $progress = round(($deletedCount / $totalCount) * 100, 2);
+ $output->write(" Progress: {$progress}% ({$deletedCount}/{$totalCount})\r");
+
+ // 短暂暂停，减轻数据库负担
+ usleep(500000); // 暂停0.5秒
+ }
+
+ $output->writeln("");
+ $output->writeln("
Successfully deleted {$deletedCount} expired group messages.");
+
+ // 优化表
+ $output->writeln(" Optimizing table...");
+ Db::execute("OPTIMIZE TABLE s2_wechat_group_message");
+ $output->writeln("
Table optimization completed.");
+ }
+}
\ No newline at end of file
diff --git a/Server/application/command/CleanExpiredMessages.php b/Server/application/command/CleanExpiredMessages.php
new file mode 100644
index 00000000..d499f653
--- /dev/null
+++ b/Server/application/command/CleanExpiredMessages.php
@@ -0,0 +1,100 @@
+setName('clean:expired_messages')
+ ->setDescription('Clean expired messages from the database')
+ ->addOption('days', 'd', Option::VALUE_OPTIONAL, 'Number of days to keep messages (default: 90)', 90)
+ ->addOption('dry-run', null, Option::VALUE_NONE, 'Perform a dry run without deleting any data')
+ ->addOption('batch-size', 'b', Option::VALUE_OPTIONAL, 'Batch size for deletion (default: 1000)', 1000);
+ }
+
+ protected function execute(Input $input, Output $output)
+ {
+ $days = (int)$input->getOption('days');
+ $dryRun = $input->getOption('dry-run');
+ $batchSize = (int)$input->getOption('batch-size');
+
+ if ($dryRun) {
+ $output->writeln("
Running in dry-run mode. No data will be deleted.");
+ }
+
+ $cutoffDate = date('Y-m-d H:i:s', strtotime("-{$days} days"));
+ $output->writeln("
Cleaning messages older than {$cutoffDate} (keeping last {$days} days)");
+
+ // 清理微信消息
+ $this->cleanWechatMessages($cutoffDate, $dryRun, $batchSize, $output);
+
+ $output->writeln("
Message cleanup completed successfully.");
+ }
+
+ protected function cleanWechatMessages($cutoffDate, $dryRun, $batchSize, Output $output)
+ {
+ $output->writeln("\nCleaning s2_wechat_message table...");
+
+ // 获取符合条件的消息总数
+ $totalCount = Db::table('s2_wechat_message')
+ ->where('createTime', '<', $cutoffDate)
+ ->count();
+
+ if ($totalCount === 0) {
+ $output->writeln("
No expired messages found.");
+ return;
+ }
+
+ $output->writeln(" Found {$totalCount} messages to clean up.");
+
+ if ($dryRun) {
+ $output->writeln("
Dry run mode: would delete {$totalCount} messages.");
+ return;
+ }
+
+ // 计算需要执行的批次数
+ $batches = ceil($totalCount / $batchSize);
+ $deletedCount = 0;
+
+ $output->writeln(" Deleting in {$batches} batches of {$batchSize} records...");
+
+ // 分批删除数据
+ for ($i = 0; $i < $batches; $i++) {
+ // 获取一批要删除的ID
+ $ids = Db::table('s2_wechat_message')
+ ->where('createTime', '<', $cutoffDate)
+ ->limit($batchSize)
+ ->column('id');
+
+ if (empty($ids)) {
+ break;
+ }
+
+ // 删除这批数据
+ $count = Db::table('s2_wechat_message')
+ ->whereIn('id', $ids)
+ ->delete();
+
+ $deletedCount += $count;
+ $progress = round(($deletedCount / $totalCount) * 100, 2);
+ $output->write(" Progress: {$progress}% ({$deletedCount}/{$totalCount})\r");
+
+ // 短暂暂停，减轻数据库负担
+ usleep(500000); // 暂停0.5秒
+ }
+
+ $output->writeln("");
+ $output->writeln("
Successfully deleted {$deletedCount} expired messages.");
+
+ // 优化表
+ $output->writeln(" Optimizing table...");
+ Db::execute("OPTIMIZE TABLE s2_wechat_message");
+ $output->writeln("
Table optimization completed.");
+ }
+}
\ No newline at end of file
diff --git a/Server/application/command/OptimizeMessageIndexes.php b/Server/application/command/OptimizeMessageIndexes.php
new file mode 100644
index 00000000..a604191e
--- /dev/null
+++ b/Server/application/command/OptimizeMessageIndexes.php
@@ -0,0 +1,112 @@
+setName('optimize:message_indexes')
+ ->setDescription('Optimize database indexes for message-related tables');
+ }
+
+ protected function execute(Input $input, Output $output)
+ {
+ $output->writeln("Starting index optimization for message-related tables...");
+
+ // 优化 s2_wechat_message 表索引
+ $this->optimizeWechatMessageIndexes($output);
+
+ // 优化 s2_wechat_chatroom 表索引
+ $this->optimizeWechatChatroomIndexes($output);
+
+ // 优化 s2_wechat_friend 表索引
+ $this->optimizeWechatFriendIndexes($output);
+
+ $output->writeln("Index optimization completed successfully.");
+ }
+
+ protected function optimizeWechatMessageIndexes(Output $output)
+ {
+ $output->writeln("Optimizing s2_wechat_message table indexes...");
+
+ // 检查并添加 wechatChatroomId 索引
+ $this->addIndexIfNotExists('s2_wechat_message', 'idx_chatroom_id', 'wechatChatroomId', $output);
+
+ // 检查并添加 wechatFriendId 索引
+ $this->addIndexIfNotExists('s2_wechat_message', 'idx_friend_id', 'wechatFriendId', $output);
+
+ // 检查并添加 isRead 索引
+ $this->addIndexIfNotExists('s2_wechat_message', 'idx_is_read', 'isRead', $output);
+
+ // 检查并添加 type 索引
+ $this->addIndexIfNotExists('s2_wechat_message', 'idx_type', 'type', $output);
+
+ // 检查并添加 createTime 索引
+ $this->addIndexIfNotExists('s2_wechat_message', 'idx_create_time', 'createTime', $output);
+
+ // 检查并添加组合索引 (wechatChatroomId, isRead)
+ $this->addIndexIfNotExists('s2_wechat_message', 'idx_chatroom_read', 'wechatChatroomId,isRead', $output);
+
+ // 检查并添加组合索引 (wechatFriendId, isRead)
+ $this->addIndexIfNotExists('s2_wechat_message', 'idx_friend_read', 'wechatFriendId,isRead', $output);
+ }
+
+ protected function optimizeWechatChatroomIndexes(Output $output)
+ {
+ $output->writeln("Optimizing s2_wechat_chatroom table indexes...");
+
+ // 检查并添加 accountId 索引
+ $this->addIndexIfNotExists('s2_wechat_chatroom', 'idx_account_id', 'accountId', $output);
+
+ // 检查并添加 isDeleted 索引
+ $this->addIndexIfNotExists('s2_wechat_chatroom', 'idx_is_deleted', 'isDeleted', $output);
+
+ // 检查并添加组合索引 (accountId, isDeleted)
+ $this->addIndexIfNotExists('s2_wechat_chatroom', 'idx_account_deleted', 'accountId,isDeleted', $output);
+ }
+
+ protected function optimizeWechatFriendIndexes(Output $output)
+ {
+ $output->writeln("Optimizing s2_wechat_friend table indexes...");
+
+ // 检查并添加 accountId 索引
+ $this->addIndexIfNotExists('s2_wechat_friend', 'idx_account_id', 'accountId', $output);
+
+ // 检查并添加 isDeleted 索引
+ $this->addIndexIfNotExists('s2_wechat_friend', 'idx_is_deleted', 'isDeleted', $output);
+
+ // 检查并添加组合索引 (accountId, isDeleted)
+ $this->addIndexIfNotExists('s2_wechat_friend', 'idx_account_deleted', 'accountId,isDeleted', $output);
+ }
+
+ protected function addIndexIfNotExists($table, $indexName, $columns, Output $output)
+ {
+ try {
+ // 检查索引是否已存在
+ $indexExists = false;
+ $indexes = Db::query("SHOW INDEX FROM {$table}");
+
+ foreach ($indexes as $index) {
+ if ($index['Key_name'] === $indexName) {
+ $indexExists = true;
+ break;
+ }
+ }
+
+ if (!$indexExists) {
+ // 添加索引
+ Db::execute("ALTER TABLE {$table} ADD INDEX {$indexName} ({$columns})");
+ $output->writeln(" - Added index {$indexName} on {$table}({$columns})");
+ } else {
+ $output->writeln(" - Index {$indexName} already exists on {$table}");
+ }
+ } catch (\Exception $e) {
+ $output->writeln(" - Error adding index {$indexName} to {$table}: " . $e->getMessage());
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/application/command/ScheduleMessageMaintenance.php b/Server/application/command/ScheduleMessageMaintenance.php
new file mode 100644
index 00000000..359faf93
--- /dev/null
+++ b/Server/application/command/ScheduleMessageMaintenance.php
@@ -0,0 +1,121 @@
+setName('schedule:message_maintenance')
+ ->setDescription('Schedule and run message maintenance tasks')
+ ->addOption('optimize-indexes', null, Option::VALUE_NONE, 'Run index optimization')
+ ->addOption('clean-messages', null, Option::VALUE_NONE, 'Clean expired messages')
+ ->addOption('days', 'd', Option::VALUE_OPTIONAL, 'Number of days to keep messages (default: 90)', 90)
+ ->addOption('batch-size', 'b', Option::VALUE_OPTIONAL, 'Batch size for deletion (default: 1000)', 1000)
+ ->addOption('dry-run', null, Option::VALUE_NONE, 'Perform a dry run without deleting any data');
+ }
+
+ protected function execute(Input $input, Output $output)
+ {
+ $optimizeIndexes = $input->getOption('optimize-indexes');
+ $cleanMessages = $input->getOption('clean-messages');
+ $days = (int)$input->getOption('days');
+ $batchSize = (int)$input->getOption('batch-size');
+ $dryRun = $input->getOption('dry-run');
+
+ // 如果没有指定任何选项，则运行所有维护任务
+ if (!$optimizeIndexes && !$cleanMessages) {
+ $optimizeIndexes = true;
+ $cleanMessages = true;
+ }
+
+ $output->writeln("
Starting scheduled message maintenance tasks...");
+ $startTime = microtime(true);
+
+ // 运行索引优化
+ if ($optimizeIndexes) {
+ $this->runCommand($output, 'optimize:message_indexes');
+ }
+
+ // 清理过期消息
+ if ($cleanMessages) {
+ $options = [];
+
+ if ($days !== 90) {
+ $options[] = "--days={$days}";
+ }
+
+ if ($batchSize !== 1000) {
+ $options[] = "--batch-size={$batchSize}";
+ }
+
+ if ($dryRun) {
+ $options[] = "--dry-run";
+ }
+
+ $this->runCommand($output, 'clean:expired_messages', $options);
+ $this->runCommand($output, 'clean:expired_group_messages', $options);
+ }
+
+ $endTime = microtime(true);
+ $executionTime = round($endTime - $startTime, 2);
+ $output->writeln("
All maintenance tasks completed in {$executionTime} seconds.");
+ }
+
+ protected function runCommand(Output $output, $command, array $options = [])
+ {
+ $output->writeln("\n
Running command: {$command}");
+
+ $optionsStr = implode(' ', $options);
+ $fullCommand = "php think {$command} {$optionsStr}";
+
+ $output->writeln("Executing: {$fullCommand}");
+ $output->writeln("\n
Command output:");
+
+ // 执行命令并实时输出结果
+ $descriptorSpec = [
+ 0 => ["pipe", "r"], // stdin
+ 1 => ["pipe", "w"], // stdout
+ 2 => ["pipe", "w"] // stderr
+ ];
+
+ $process = proc_open($fullCommand, $descriptorSpec, $pipes);
+
+ if (is_resource($process)) {
+ // 关闭标准输入
+ fclose($pipes[0]);
+
+ // 读取标准输出
+ while (!feof($pipes[1])) {
+ $line = fgets($pipes[1]);
+ if ($line !== false) {
+ $output->write($line);
+ }
+ }
+ fclose($pipes[1]);
+
+ // 读取标准错误
+ $errorOutput = stream_get_contents($pipes[2]);
+ fclose($pipes[2]);
+
+ // 获取命令执行结果
+ $exitCode = proc_close($process);
+
+ if ($exitCode !== 0) {
+ $output->writeln("\n
Command failed with exit code {$exitCode}");
+ if (!empty($errorOutput)) {
+ $output->writeln("
Error output:");
+ $output->writeln($errorOutput);
+ }
+ } else {
+ $output->writeln("\n
Command completed successfully.");
+ }
+ } else {
+ $output->writeln("
Failed to execute command.");
+ }
+ }
+}
\ No newline at end of file
diff --git a/Server/application/common/config/route.php b/Server/application/common/config/route.php
index 8c6ccc6b..fc94c79b 100644
--- a/Server/application/common/config/route.php
+++ b/Server/application/common/config/route.php
@@ -9,7 +9,6 @@ Route::group('v1/auth', function () {
Route::post('login', 'app\common\controller\PasswordLoginController@index'); // 账号密码登录
Route::post('mobile-login', 'app\common\controller\Auth@mobileLogin'); // 手机号验证码登录
Route::post('code', 'app\common\controller\Auth@SendCodeController'); // 发送验证码
-
// 需要JWT认证的接口
Route::get('info', 'app\common\controller\Auth@info')->middleware(['jwt']); // 获取用户信息
Route::post('refresh', 'app\common\controller\Auth@refresh')->middleware(['jwt']); // 刷新令牌
@@ -22,4 +21,13 @@ Route::group('v1/', function () {
})->middleware(['jwt']);
-Route::get('app/update', 'app\common\controller\Api@uploadApp');
\ No newline at end of file
+
+Route::group('v1/pay', function () {
+ Route::post('', 'app\cunkebao\controller\Pay@createOrder')->middleware(['jwt']);
+ Route::any('notify', 'app\common\controller\PaymentService@notify');
+});
+
+
+
+
+Route::get('app/update', 'app\common\controller\PaymentService@createOrder');
\ No newline at end of file
diff --git a/Server/application/common/controller/PaymentService.php b/Server/application/common/controller/PaymentService.php
new file mode 100644
index 00000000..3e7e6a25
--- /dev/null
+++ b/Server/application/common/controller/PaymentService.php
@@ -0,0 +1,366 @@
+ 'unified.trade.native',
+ 'sign_type' => PaymentUtil::SIGN_TYPE_MD5,
+ 'mch_id' => Env::get('payment.mchId'),
+ 'out_trade_no' => $order['orderNo'],
+ 'body' => $order['goodsName'] ?? '',
+ 'total_fee' => $order['money'] ?? 0,
+ 'mch_create_ip' => Request::ip(),
+ 'notify_url' => Env::get('payment.notify_url', '127.0.0.1'),
+ 'nonce_str' => PaymentUtil::generateNonceStr(),
+ ];
+
+ Db::startTrans();
+ try {
+ // 过滤空值签名
+ $secret = Env::get('payment.key');
+ $params['sign_type'] = 'MD5';
+ $params['sign'] = PaymentUtil::generateSign($params, $secret, 'MD5');
+
+ $url = Env::get('payment.url');
+ if (empty($url)) {
+ throw new \Exception('支付网关地址未配置');
+ }
+
+ //创建订单
+ Order::create([
+ 'mchId' => $params['mch_id'],
+ 'companyId' => $order['companyId'],
+ 'userId' => $order['userId'],
+ 'orderType' => $order['orderType'] ?? 1,
+ 'status' => 0,
+ 'goodsId' => $order['goodsId'],
+ 'goodsName' => $order['goodsName'],
+ 'money' => $order['money'],
+ 'orderNo' => $order['orderNo'],
+ 'ip' => Request::ip(),
+ 'nonceStr' => $params['nonce_str'],
+ 'createTime' => time(),
+ ]);
+
+
+ // XML POST 请求
+ $xmlBody = $this->arrayToXml($params);
+ $response = $this->postXml($url, $xmlBody);
+ $parsed = $this->parseXmlOrRaw($response);
+
+ if ($parsed['status'] == 0 && $parsed['result_code'] == 0) {
+ Db::commit();
+ return json(['code' => 200, 'msg' => '订单创建成功', 'data' => $parsed['code_url']]);
+ } else {
+ Db::rollback();
+ return json(['code' => 500, 'msg' => '订单创建失败：' . $parsed['err_msg']]);
+ }
+
+ } catch (\Exception $e) {
+ Db::rollback();
+ return json(['code' => 500, 'msg' => '订单创建失败：' . $e->getMessage()]);
+ }
+ }
+
+
+ /**
+ * POST 请求（x-www-form-urlencoded）
+ */
+ protected function httpPost(string $url, array $params, array $headers = [])
+ {
+ if (!function_exists('requestCurl')) {
+ throw new \RuntimeException('requestCurl 未定义');
+ }
+ return requestCurl($url, $params, 'POST', $headers, 'dataBuild');
+ }
+
+ /**
+ * 解析响应
+ */
+ protected function parseResponse($response)
+ {
+ if ($response === '' || $response === null) {
+ return '';
+ }
+ $decoded = json_decode($response, true);
+ if (json_last_error() === JSON_ERROR_NONE) {
+ return $decoded;
+ }
+ if (strpos($response, '=') !== false && strpos($response, '&') !== false) {
+ $arr = [];
+ foreach (explode('&', $response) as $pair) {
+ if ($pair === '') continue;
+ $kv = explode('=', $pair, 2);
+ $arr[$kv[0]] = $kv[1] ?? '';
+ }
+ return $arr;
+ }
+ return $response;
+ }
+
+ /**
+ * 以 XML 方式 POST（text/xml）
+ */
+ protected function postXml(string $url, string $xml)
+ {
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+ curl_setopt($ch, CURLOPT_HTTPHEADER, [
+ 'Content-Type: text/xml; charset=UTF-8'
+ ]);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $xml);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+ $res = curl_exec($ch);
+ curl_close($ch);
+ return $res;
+ }
+
+ /**
+ * 数组转 XML（按 ASCII 升序，字符串走 CDATA）
+ */
+ protected function arrayToXml(array $data): string
+ {
+ // 过滤空值
+ $filtered = [];
+ foreach ($data as $k => $v) {
+ if ($v === '' || $v === null) continue;
+ $filtered[$k] = $v;
+ }
+ ksort($filtered, SORT_STRING);
+
+ $xml = '
';
+ foreach ($filtered as $key => $value) {
+ if (is_numeric($value)) {
+ $xml .= "<{$key}>{$value}";
+ } else {
+ $xml .= "<{$key}>";
+ }
+ }
+ $xml .= '';
+ return $xml;
+ }
+
+ /**
+ * 解析 XML 响应
+ */
+ protected function parseXmlOrRaw($response)
+ {
+ if (!is_string($response) || $response === '') {
+ return $response;
+ }
+ libxml_use_internal_errors(true);
+ $xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA);
+ if ($xml !== false) {
+ $json = json_encode($xml, JSON_UNESCAPED_UNICODE);
+ return json_decode($json, true);
+ }
+ return $response;
+ }
+
+ /**
+ * 支付结果异步通知
+ * - 威富通回调为 XML；需校验签名与业务字段并更新订单
+ * - 回应：成功回"success"，失败回"fail"
+ * @return void
+ */
+ public function notify()
+ {
+ $rawBody = file_get_contents('php://input');
+ $payload = $this->parseXmlOrRaw($rawBody);
+ if (!is_array($payload) || empty($payload)) {
+ return json_encode(['code' => 500, 'msg' => 'XML解析错误']);
+ }
+
+
+ if ($payload['status'] != 0 || $payload['result_code'] != 0) {
+ $errMsg = (isset($payload['err_msg']) ? $payload['err_msg'] : isset($payload['err_msg'])) ? $payload['err_msg'] : '未知错误';
+ return json_encode(['code' => 500, 'msg' => $errMsg]);
+ }
+
+
+ // 业务处理：更新订单
+ Db::startTrans();
+ try {
+ $outTradeNo = $payload['out_trade_no'];
+ $pay_result = $payload['pay_result'];
+ $time_end = $payload['time_end'];
+ $order = Order::where('orderNo', $outTradeNo)->find();
+ if (!$order) {
+ Db::rollback();
+ return json_encode(['code' => 500, 'msg' => '该订单不存在']);
+ }
+
+ if ($pay_result != 0) {
+ $order->payInfo = $payload['pay_info'];
+ $order->payType = $payload['trade_type'] == 'pay.wechat.jspay' ? 1 : 2;
+ $order->status = 3;
+ $order->save();
+ Db::commit();
+ return json_encode(['code' => 500, 'msg' => $payload['pay_info']]);
+ }
+ $order->status = 1;
+ $order->payTime = $this->parsePayTime($time_end);
+ $order->save();
+ Db::commit();
+ return json_encode(['code' => 200, 'msg' => '付款成功']);
+ } catch (\Exception $e) {
+ Db::rollback();
+ return json_encode(['code' => 500, 'msg' => '付款失败' . $e->getMessage()]);
+ }
+ }
+
+ /**
+ * 解析威富通时间（yyyyMMddHHmmss）为时间戳
+ */
+ protected function parsePayTime(string $timeEnd)
+ {
+ if ($timeEnd === '') {
+ return 0;
+ }
+ // 期望格式：20250102153045
+ if (preg_match('/^\\d{14}$/', $timeEnd) !== 1) {
+ return 0;
+ }
+ $dt = \DateTime::createFromFormat('YmdHis', $timeEnd, new \DateTimeZone('Asia/Shanghai'));
+ return $dt ? $dt->getTimestamp() : 0;
+ }
+
+ /**
+ * 查询订单（威富通 unified.trade.query）
+ * - 入参：商户订单号或平台交易号
+ * - 出参：统一 JSON 格式，包含交易状态与关键信息
+ * @param array $query
+ * - out_trade_no: string 商户订单号（与 transaction_id 二选一）
+ * - transaction_id: string 平台交易号（与 out_trade_no 二选一）
+ * @return \think\response\Json
+ */
+ public function queryOrder(array $query)
+ {
+ $outTradeNo = $query['out_trade_no'] ?? ($query['orderNo'] ?? '');
+ $transactionId = $query['transaction_id'] ?? '';
+
+ if ($outTradeNo === '' && $transactionId === '') {
+ return json(['code' => 422, 'msg' => '缺少查询参数：out_trade_no 或 transaction_id']);
+ }
+
+ $params = [
+ 'service' => 'unified.trade.query',
+ 'mch_id' => Env::get('payment.mchId'),
+ 'out_trade_no' => $outTradeNo ?: null,
+ 'nonce_str' => PaymentUtil::generateNonceStr(),
+ 'sign_type' => 'MD5',
+ ];
+
+ // 过滤空值后签名
+ $secret = Env::get('payment.key');
+ if (empty($secret)) {
+ return json(['code' => 500, 'msg' => '支付密钥未配置']);
+ }
+
+ $filtered = [];
+ foreach ($params as $k => $v) {
+ if ($v === '' || $v === null) continue;
+ $filtered[$k] = $v;
+ }
+ $filtered['sign'] = PaymentUtil::generateSign($filtered, $secret, $filtered['sign_type']);
+
+ $url = Env::get('payment.url');
+ if (empty($url)) {
+ return json(['code' => 500, 'msg' => '支付网关地址未配置']);
+ }
+
+ // 请求网关
+ $xmlBody = $this->arrayToXml($filtered);
+ $response = $this->postXml($url, $xmlBody);
+ $parsed = $this->parseXmlOrRaw($response);
+
+ if (!is_array($parsed)) {
+ return json(['code' => 500, 'msg' => '响应解析失败', 'data' => $response]);
+ }
+
+ if (($parsed['status'] ?? '') !== '0') {
+ return json(['code' => 500, 'msg' => '通信失败：' . ($parsed['message'] ?? 'unknown')]);
+ }
+
+ if (($parsed['result_code'] ?? '') !== '0') {
+ return json(['code' => 200, 'msg' => '业务失败', 'data' => [
+ 'err_code' => $parsed['err_code'] ?? '',
+ 'err_msg' => $parsed['err_msg'] ?? '',
+ ]]);
+ }
+
+ $tradeState = $parsed['trade_state'] ?? '';
+ $resp = [
+ 'trade_state' => $tradeState,
+ 'trade_state_desc' => $parsed['trade_state_desc'] ?? '',
+ 'transaction_id' => $parsed['transaction_id'] ?? '',
+ 'out_trade_no' => $parsed['out_trade_no'] ?? $outTradeNo,
+ 'total_fee' => isset($parsed['total_fee']) ? (int)$parsed['total_fee'] : null,
+ 'time_end' => $parsed['time_end'] ?? '',
+ 'buyer_logon_id' => $parsed['buyer_logon_id'] ?? '',
+ 'bank_type' => $parsed['bank_type'] ?? '',
+ ];
+
+ // 若已支付，同步本地订单
+ if ($tradeState === 'SUCCESS' && ($resp['out_trade_no'] ?? '') !== '') {
+ Db::startTrans();
+ try {
+ /** @var Order|null $order */
+ $order = Order::where('orderNo', $resp['out_trade_no'])->lock(true)->find();
+ if ($order) {
+ $paidAt = $this->parsePayTime($resp['time_end'] ?? '') ?: time();
+ if ((int)$order['status'] !== 1) {
+ $order->save([
+ 'status' => 1,
+ 'transactionId' => $resp['transaction_id'] ?? '',
+ 'payTime' => $paidAt,
+ 'updateTime' => time(),
+ ]);
+ }
+ }
+ Db::commit();
+ } catch (\Throwable $e) {
+ Db::rollback();
+ Log::error('[SwiftPass][query] update order exception: ' . $e->getMessage());
+ }
+ }
+
+ return json(['code' => 200, 'msg' => '查询成功', 'data' => $resp]);
+ }
+}
+
diff --git a/Server/application/common/model/Order.php b/Server/application/common/model/Order.php
new file mode 100644
index 00000000..82b6b5b8
--- /dev/null
+++ b/Server/application/common/model/Order.php
@@ -0,0 +1,14 @@
+ $value) {
+ $pairs[] = $key . '=' . $value;
+ }
+ return implode('&', $pairs);
+ }
+
+ /**
+ * 生成MD5签名
+ *
+ * @param string $queryString 待签名字符串
+ * @param string $secretKey 密钥
+ * @return string MD5签名
+ */
+ private static function generateMd5Sign(string $queryString, string $secretKey): string
+ {
+ $signString = $queryString . '&key=' . $secretKey;
+ return strtoupper(md5($signString));
+ }
+
+ /**
+ * 生成RSA256签名
+ *
+ * @param string $queryString 待签名字符串
+ * @param string $privateKey 私钥
+ * @return string RSA256签名
+ */
+ private static function generateRsa256Sign(string $queryString, string $privateKey): string
+ {
+ $privateKey = self::formatPrivateKey($privateKey);
+ $key = openssl_pkey_get_private($privateKey);
+ if (!$key) {
+ throw new \Exception('RSA私钥格式错误');
+ }
+
+ $signature = '';
+ $result = openssl_sign($queryString, $signature, $key, OPENSSL_ALGO_SHA256);
+ openssl_pkey_free($key);
+
+ if (!$result) {
+ throw new \Exception('RSA256签名失败');
+ }
+
+ return base64_encode($signature);
+ }
+
+ /**
+ * 生成RSA1签名
+ *
+ * @param string $queryString 待签名字符串
+ * @param string $privateKey 私钥
+ * @return string RSA1签名
+ */
+ private static function generateRsa1Sign(string $queryString, string $privateKey): string
+ {
+ $privateKey = self::formatPrivateKey($privateKey);
+ $key = openssl_pkey_get_private($privateKey);
+ if (!$key) {
+ throw new \Exception('RSA私钥格式错误');
+ }
+
+ $signature = '';
+ $result = openssl_sign($queryString, $signature, $key, OPENSSL_ALGO_SHA1);
+ openssl_pkey_free($key);
+
+ if (!$result) {
+ throw new \Exception('RSA1签名失败');
+ }
+
+ return base64_encode($signature);
+ }
+
+ /**
+ * 格式化私钥
+ *
+ * @param string $privateKey 原始私钥
+ * @return string 格式化后的私钥
+ */
+ private static function formatPrivateKey(string $privateKey): string
+ {
+ $privateKey = str_replace(['-----BEGIN PRIVATE KEY-----', '-----END PRIVATE KEY-----', "\n", "\r"], '', $privateKey);
+ $privateKey = chunk_split($privateKey, 64, "\n");
+ return "-----BEGIN PRIVATE KEY-----\n" . $privateKey . "-----END PRIVATE KEY-----";
+ }
+
+ /**
+ * 格式化公钥
+ *
+ * @param string $publicKey 原始公钥
+ * @return string 格式化后的公钥
+ */
+ private static function formatPublicKey(string $publicKey): string
+ {
+ $publicKey = str_replace(['-----BEGIN PUBLIC KEY-----', '-----END PUBLIC KEY-----', "\n", "\r"], '', $publicKey);
+ $publicKey = chunk_split($publicKey, 64, "\n");
+ return "-----BEGIN PUBLIC KEY-----\n" . $publicKey . "-----END PUBLIC KEY-----";
+ }
+
+ /**
+ * 验证RSA签名
+ *
+ * @param string $queryString 原始字符串
+ * @param string $signature 签名
+ * @param string $publicKey 公钥
+ * @param string $signType 签名类型
+ * @return bool 验证结果
+ */
+ public static function verifyRsaSign(string $queryString, string $signature, string $publicKey, string $signType = self::SIGN_TYPE_RSA_1_256): bool
+ {
+ $publicKey = self::formatPublicKey($publicKey);
+ $key = openssl_pkey_get_public($publicKey);
+ if (!$key) {
+ return false;
+ }
+
+ $algorithm = $signType === self::SIGN_TYPE_RSA_1_1 ? OPENSSL_ALGO_SHA1 : OPENSSL_ALGO_SHA256;
+ $result = openssl_verify($queryString, base64_decode($signature), $key, $algorithm);
+ openssl_pkey_free($key);
+
+ return $result === 1;
+ }
+
+ /**
+ * 生成随机字符串
+ *
+ * @param int $length 长度
+ * @return string 随机字符串
+ */
+ public static function generateNonceStr(int $length = 32): string
+ {
+ $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+ $str = '';
+ for ($i = 0; $i < $length; $i++) {
+ $str .= $chars[mt_rand(0, strlen($chars) - 1)];
+ }
+ return $str;
+ }
+
+ /**
+ * 生成时间戳
+ *
+ * @return int 时间戳
+ */
+ public static function generateTimestamp(): int
+ {
+ return time();
+ }
+
+ /**
+ * 格式化金额（分转元）
+ *
+ * @param int $amount 金额（分）
+ * @return string 格式化后的金额（元）
+ */
+ public static function formatAmount(int $amount): string
+ {
+ return number_format($amount / 100, 2, '.', '');
+ }
+
+ /**
+ * 解析金额（元转分）
+ *
+ * @param string $amount 金额（元）
+ * @return int 金额（分）
+ */
+ public static function parseAmount(string $amount): int
+ {
+ return (int) round(floatval($amount) * 100);
+ }
+}
diff --git a/Server/application/common/util/Signer.php b/Server/application/common/util/Signer.php
new file mode 100644
index 00000000..9b68840d
--- /dev/null
+++ b/Server/application/common/util/Signer.php
@@ -0,0 +1,135 @@
+ $value) {
+ if ($key === 'sign') {
+ continue;
+ }
+ if ($value === '' || $value === null) {
+ continue;
+ }
+ $filtered[$key] = $value;
+ }
+
+ ksort($filtered, SORT_STRING);
+
+ $pairs = [];
+ foreach ($filtered as $key => $value) {
+ // 原始值拼接，不做 urlencode
+ $pairs[] = $key . '=' . (is_bool($value) ? ($value ? '1' : '0') : (string)$value);
+ }
+
+ return implode('&', $pairs);
+ }
+
+ /**
+ * MD5 签名
+ * - 若提供 secret，则原串末尾追加 &key=SECRET
+ * - 返回 32 位小写
+ *
+ * @param string $signString
+ * @param string|null $secret
+ * @return string
+ */
+ protected static function signMd5($signString, $secret = null)
+ {
+ if ($secret !== null && $secret !== '') {
+ $signString .= '&key=' . $secret;
+ }
+ return strtolower(md5($signString));
+ }
+
+ /**
+ * RSA 签名
+ *
+ * @param string $signString
+ * @param array $options 必填：private_key，可选：passphrase
+ * @param string $hashAlgo sha256|sha1
+ * @return string base64 签名
+ * @throws \InvalidArgumentException
+ */
+ protected static function signRsa($signString, array $options, $hashAlgo = 'sha256')
+ {
+ if (empty($options['private_key'])) {
+ throw new \InvalidArgumentException('RSA signing requires private_key.');
+ }
+
+ $privateKey = $options['private_key'];
+ $passphrase = isset($options['passphrase']) ? (string)$options['passphrase'] : '';
+
+ // 兼容无头尾私钥，自动包裹为 PEM
+ if (strpos($privateKey, 'BEGIN') === false) {
+ $privateKey = "-----BEGIN PRIVATE KEY-----\n" . trim(chunk_split(str_replace(["\r", "\n"], '', $privateKey), 64, "\n")) . "\n-----END PRIVATE KEY-----";
+ }
+
+ $pkeyId = openssl_pkey_get_private($privateKey, $passphrase);
+ if ($pkeyId === false) {
+ throw new \InvalidArgumentException('Invalid RSA private key or passphrase.');
+ }
+
+ $signature = '';
+ $algoConst = $hashAlgo === 'sha1' ? OPENSSL_ALGO_SHA1 : OPENSSL_ALGO_SHA256;
+ $ok = openssl_sign($signString, $signature, $pkeyId, $algoConst);
+ openssl_free_key($pkeyId);
+
+ if (!$ok) {
+ throw new \InvalidArgumentException('OpenSSL sign failed.');
+ }
+
+ return base64_encode($signature);
+ }
+}
+
+
diff --git a/Server/application/cunkebao/controller/Pay.php b/Server/application/cunkebao/controller/Pay.php
new file mode 100644
index 00000000..99553f0c
--- /dev/null
+++ b/Server/application/cunkebao/controller/Pay.php
@@ -0,0 +1,27 @@
+ 111,
+ 'userId' => 111,
+ 'orderNo' => date('YmdHis') . rand(100000, 999999),
+ 'goodsId' => 34,
+ 'goodsName' => '测试测试',
+ 'orderType' => 1,
+ 'money' => 1
+ ];
+
+ $paymentService = new PaymentService();
+ $res = $paymentService->createOrder($order);
+ return $res;
+ }
+}
\ No newline at end of file
diff --git a/Server/application/cunkebao/controller/WorkbenchController.php b/Server/application/cunkebao/controller/WorkbenchController.php
index e273675b..9499c40f 100644
--- a/Server/application/cunkebao/controller/WorkbenchController.php
+++ b/Server/application/cunkebao/controller/WorkbenchController.php
@@ -149,7 +149,7 @@ class WorkbenchController extends Controller
$config->startTime = $param['startTime'];
$config->endTime = $param['endTime'];
$config->devices = json_encode($param['deviceGroups'], JSON_UNESCAPED_UNICODE);
- $config->pools = json_encode($param['pools'], JSON_UNESCAPED_UNICODE);
+ $config->pools = json_encode($param['poolGroups'], JSON_UNESCAPED_UNICODE);
$config->account = json_encode($param['accountGroups'], JSON_UNESCAPED_UNICODE);
$config->createTime = time();
$config->updateTime = time();
@@ -159,7 +159,7 @@ class WorkbenchController extends Controller
$config = new WorkbenchImportContact;
$config->workbenchId = $workbench->id;
$config->devices = json_encode($param['deviceGroups'], JSON_UNESCAPED_UNICODE);
- $config->pools = json_encode($param['pools'], JSON_UNESCAPED_UNICODE);
+ $config->pools = json_encode($param['poolGroups'], JSON_UNESCAPED_UNICODE);
$config->num = $param['num'];
$config->clearContact = $param['clearContact'];
$config->remark = $param['remark'];
@@ -314,13 +314,13 @@ class WorkbenchController extends Controller
if (!empty($item->trafficConfig)) {
$item->config = $item->trafficConfig;
$item->config->devices = json_decode($item->config->devices, true);
- $item->config->pools = json_decode($item->config->pools, true);
+ $item->config->poolGroups = json_decode($item->config->pools, true);
$item->config->account = json_decode($item->config->account, true);
$config_item = Db::name('workbench_traffic_config_item')->where(['workbenchId' => $item->id])->order('id DESC')->find();
$item->config->lastUpdated = !empty($config_item) ? date('Y-m-d H:i', $config_item['createTime']) : '--';
//统计
- $labels = $item->config->pools;
+ $labels = $item->config->poolGroups;
$totalUsers = Db::table('s2_wechat_friend')->alias('wf')
->join(['s2_company_account' => 'sa'], 'sa.id = wf.accountId', 'left')
->join(['s2_wechat_account' => 'wa'], 'wa.id = wf.wechatAccountId', 'left')
@@ -352,7 +352,7 @@ class WorkbenchController extends Controller
'dailyAverage' => intval($dailyAverage),
'totalAccounts' => $totalAccounts,
'deviceCount' => count($item->config->devices),
- 'poolCount' => !empty($item->config->pools) ? count($item->config->pools) : 'ALL',
+ 'poolCount' => !empty($item->config->poolGroups) ? count($item->config->poolGroups) : 'ALL',
'totalUsers' => $totalUsers >> 0
];
}
@@ -363,7 +363,7 @@ class WorkbenchController extends Controller
if (!empty($item->importContact)) {
$item->config = $item->importContact;
$item->config->devices = json_decode($item->config->devices, true);
- $item->config->pools = json_decode($item->config->pools, true);
+ $item->config->poolGroups = json_decode($item->config->pools, true);
}
unset($item->importContact, $item->import_contact);
break;
@@ -505,12 +505,12 @@ class WorkbenchController extends Controller
$workbench->config = $workbench->trafficConfig;
$workbench->config->deviceGroups = json_decode($workbench->config->devices, true);
$workbench->config->accountGroups = json_decode($workbench->config->account, true);
- $workbench->config->pools = json_decode($workbench->config->pools, true);
+ $workbench->config->poolGroups = json_decode($workbench->config->pools, true);
$config_item = Db::name('workbench_traffic_config_item')->where(['workbenchId' => $workbench->id])->order('id DESC')->find();
$workbench->config->lastUpdated = !empty($config_item) ? date('Y-m-d H:i', $config_item['createTime']) : '--';
//统计
- $labels = $workbench->config->pools;
+ $labels = $workbench->config->poolGroups;
$totalUsers = Db::table('s2_wechat_friend')->alias('wf')
->join(['s2_company_account' => 'sa'], 'sa.id = wf.accountId', 'left')
->join(['s2_wechat_account' => 'wa'], 'wa.id = wf.wechatAccountId', 'left')
@@ -549,7 +549,7 @@ class WorkbenchController extends Controller
'dailyAverage' => intval($dailyAverage),
'totalAccounts' => $totalAccounts,
'deviceCount' => count($workbench->config->deviceGroups),
- 'poolCount' => count($workbench->config->pools),
+ 'poolCount' => count($workbench->config->poolGroups),
'totalUsers' => $totalUsers >> 0
];
unset($workbench->trafficConfig, $workbench->traffic_config);
@@ -559,7 +559,7 @@ class WorkbenchController extends Controller
if (!empty($workbench->importContact)) {
$workbench->config = $workbench->importContact;
$workbench->config->deviceGroups = json_decode($workbench->config->devices, true);
- $workbench->config->pools = json_decode($workbench->config->pools, true);
+ $workbench->config->poolGroups = json_decode($workbench->config->pools, true);
}
unset($workbench->importContact, $workbench->import_contact);
break;
@@ -789,7 +789,7 @@ class WorkbenchController extends Controller
$config->startTime = $param['startTime'];
$config->endTime = $param['endTime'];
$config->devices = json_encode($param['deviceGroups']);
- $config->pools = json_encode($param['pools']);
+ $config->pools = json_encode($param['poolGroups']);
$config->account = json_encode($param['accountGroups']);
$config->updateTime = time();
$config->save();
@@ -799,7 +799,7 @@ class WorkbenchController extends Controller
$config = WorkbenchImportContact::where('workbenchId', $param['id'])->find();;
if ($config) {
$config->devices = json_encode($param['deviceGroups']);
- $config->pools = json_encode($param['pools']);
+ $config->pools = json_encode($param['poolGroups']);
$config->num = $param['num'];
$config->clearContact = $param['clearContact'];
$config->remark = $param['remark'];
@@ -1450,7 +1450,7 @@ class WorkbenchController extends Controller
'startTime' => $param['startTime'],
'endTime' => $param['endTime'],
'targets' => json_encode($param['targets'], JSON_UNESCAPED_UNICODE),
- 'pools' => json_encode($param['pools'], JSON_UNESCAPED_UNICODE),
+ 'pools' => json_encode($param['poolGroups'], JSON_UNESCAPED_UNICODE),
'createTime' => time(),
'updateTime' => time()
]);
diff --git a/Server/application/cunkebao/controller/plan/GetAddFriendPlanDetailV1Controller.php b/Server/application/cunkebao/controller/plan/GetAddFriendPlanDetailV1Controller.php
index 7ec88c07..55dfaae4 100644
--- a/Server/application/cunkebao/controller/plan/GetAddFriendPlanDetailV1Controller.php
+++ b/Server/application/cunkebao/controller/plan/GetAddFriendPlanDetailV1Controller.php
@@ -120,7 +120,7 @@ class GetAddFriendPlanDetailV1Controller extends Controller
// 解析JSON字段
$sceneConf = json_decode($plan['sceneConf'], true) ?: [];
$reqConf = json_decode($plan['reqConf'], true) ?: [];
- $reqConf['deveiceGroups'] = $reqConf['device'];
+ $reqConf['deviceGroups'] = $reqConf['device'];
$msgConf = json_decode($plan['msgConf'], true) ?: [];
$tagConf = json_decode($plan['tagConf'], true) ?: [];
@@ -139,8 +139,8 @@ class GetAddFriendPlanDetailV1Controller extends Controller
}
- if (!empty($reqConf['deveiceGroups'])){
- $deveiceGroupsOptions = DeviceModel::alias('d')
+ if (!empty($reqConf['deviceGroups'])){
+ $deviceGroupsOptions = DeviceModel::alias('d')
->field([
'd.id', 'd.imei', 'd.memo', 'd.alive',
'l.wechatId',
@@ -149,16 +149,16 @@ class GetAddFriendPlanDetailV1Controller extends Controller
->leftJoin('device_wechat_login l', 'd.id = l.deviceId and l.alive =' . DeviceWechatLoginModel::ALIVE_WECHAT_ACTIVE . ' and l.companyId = d.companyId')
->leftJoin('wechat_account a', 'l.wechatId = a.wechatId')
->order('d.id desc')
- ->whereIn('d.id',$reqConf['deveiceGroups'])
+ ->whereIn('d.id',$reqConf['deviceGroups'])
->select();
- foreach ($deveiceGroupsOptions as &$device) {
+ foreach ($deviceGroupsOptions as &$device) {
$curstomer = WechatCustomerModel::field('friendShip')->where(['wechatId' => $device['wechatId']])->find();
$device['totalFriend'] = $curstomer->friendShip->totalFriend ?? 0;
}
unset($device);
- $reqConf['deveiceGroupsOptions'] = $deveiceGroupsOptions;
+ $reqConf['deviceGroupsOptions'] = $deviceGroupsOptions;
}else{
- $reqConf['deveiceGroupsOptions'] = [];
+ $reqConf['deviceGroupsOptions'] = [];
}
diff --git a/Server/application/cunkebao/controller/traffic/GetPotentialListWithInCompanyV1Controller.php b/Server/application/cunkebao/controller/traffic/GetPotentialListWithInCompanyV1Controller.php
index a6252698..84137be8 100644
--- a/Server/application/cunkebao/controller/traffic/GetPotentialListWithInCompanyV1Controller.php
+++ b/Server/application/cunkebao/controller/traffic/GetPotentialListWithInCompanyV1Controller.php
@@ -56,11 +56,11 @@ class GetPotentialListWithInCompanyV1Controller extends BaseController
}
if (!empty($device)) {
- $where[] = ['d.deviceId', '=', $device];
+// $where[] = ['d.deviceId', '=', $device];
}
if (!empty($taskId)) {
- $where[] = ['t.sceneId', '=', $taskId];
+ //$where[] = ['t.sceneId', '=', $taskId];
}
$where[] = ['s.companyId', '=', $this->getUserInfo('companyId')];
diff --git a/Server/application/cunkebao/validate/Workbench.php b/Server/application/cunkebao/validate/Workbench.php
index c382cfe8..ba9cb462 100644
--- a/Server/application/cunkebao/validate/Workbench.php
+++ b/Server/application/cunkebao/validate/Workbench.php
@@ -55,11 +55,9 @@ class Workbench extends Validate
'distributeType' => 'requireIf:type,5|in:1,2',
'maxPerDay' => 'requireIf:type,5|number|min:1',
'timeType' => 'requireIf:type,5|in:1,2',
- 'startTime' => 'requireIf:type,5|dateFormat:H:i',
- 'endTime' => 'requireIf:type,5|dateFormat:H:i',
'accountGroups' => 'requireIf:type,5|array|min:1',
// 通用参数
- 'deveiceGroups' => 'requireIf:type,1,2,5|array',
+ 'deviceGroups' => 'requireIf:type,1,2,5|array',
];
/**
@@ -142,8 +140,8 @@ class Workbench extends Validate
'timeType.requireIf' => '请选择时间类型',
// 通用提示
- 'deveiceGroups.require' => '请选择设备',
- 'deveiceGroups.array' => '设备格式错误',
+ 'deviceGroups.require' => '请选择设备',
+ 'deviceGroups.array' => '设备格式错误',
'targetGroups.require' => '请选择目标用户组',
'targetGroups.array' => '目标用户组格式错误',
'accountGroups.requireIf' => '流量分发时必须选择分发账号',
@@ -155,7 +153,7 @@ class Workbench extends Validate
* 验证场景
*/
protected $scene = [
- 'create' => ['name', 'type', 'autoStart', 'deveiceGroups', 'targetGroups',
+ 'create' => ['name', 'type', 'autoStart', 'deviceGroups', 'targetGroups',
'interval', 'maxLikes', 'startTime', 'endTime', 'contentTypes',
'syncInterval', 'syncCount', 'syncType',
'pushType', 'startTime', 'endTime', 'maxPerDay', 'pushOrder', 'isLoop', 'status', 'wechatGroups', 'contentGroups',
@@ -163,7 +161,7 @@ class Workbench extends Validate
'groupNameTemplate', 'maxGroupsPerDay', 'groupSizeMin', 'groupSizeMax',
],
'update_status' => ['id', 'status'],
- 'edit' => ['name', 'type', 'autoStart', 'deveiceGroups', 'targetGroups',
+ 'edit' => ['name', 'type', 'autoStart', 'deviceGroups', 'targetGroups',
'interval', 'maxLikes', 'startTime', 'endTime', 'contentTypes',
'syncInterval', 'syncCount', 'syncType',
'pushType', 'startTime', 'endTime', 'maxPerDay', 'pushOrder', 'isLoop', 'status', 'wechatGroups', 'contentGroups',
diff --git a/Touchkebao/emoji-mapping.json b/Touchkebao/emoji-mapping.json
new file mode 100644
index 00000000..deb3111d
--- /dev/null
+++ b/Touchkebao/emoji-mapping.json
@@ -0,0 +1,121 @@
+{
+ "face": {
+ "微笑": "smile",
+ "撇嘴": "pout",
+ "色": "lust",
+ "发呆": "daze",
+ "得意": "proud",
+ "流泪": "cry",
+ "害羞": "shy",
+ "闭嘴": "shut-up",
+ "睡": "sleep",
+ "大哭": "sob",
+ "尴尬": "awkward",
+ "发怒": "angry",
+ "调皮": "naughty",
+ "呲牙": "grin",
+ "惊讶": "surprised",
+ "难过": "sad",
+ "囧": "embarrassed",
+ "抓狂": "crazy",
+ "吐": "vomit",
+ "偷笑": "snicker",
+ "愉快": "happy",
+ "白眼": "roll-eyes",
+ "傲慢": "arrogant",
+ "困": "sleepy",
+ "惊恐": "panic",
+ "憨笑": "silly-smile",
+ "悠闲": "relaxed",
+ "咒骂": "curse",
+ "疑问": "question",
+ "嘘": "shush",
+ "晕": "dizzy",
+ "衰": "unlucky",
+ "骷髅": "skull",
+ "敲打": "knock",
+ "再见": "goodbye",
+ "擦汗": "wipe-sweat",
+ "抠鼻": "pick-nose",
+ "鼓掌": "clap",
+ "坏笑": "evil-smile",
+ "右哼哼": "right-hum",
+ "鄙视": "despise",
+ "委屈": "wronged",
+ "快哭了": "about-to-cry",
+ "阴险": "sinister",
+ "亲亲": "kiss",
+ "可怜": "pitiful",
+ "笑脸": "smiley",
+ "生病": "sick",
+ "脸红": "blush",
+ "破涕为笑": "smile-through-tears",
+ "恐惧": "fear",
+ "失望": "disappointed",
+ "无语": "speechless",
+ "嘿哈": "hey-ha",
+ "捂脸": "facepalm",
+ "机智": "smart",
+ "皱眉": "frown",
+ "耶": "yeah",
+ "吃瓜": "eat-melon",
+ "加油": "cheer-up",
+ "汗": "sweat",
+ "天啊": "oh-my-god",
+ "Emm": "emm",
+ "社会社会": "social",
+ "旺柴": "doge",
+ "好的": "ok",
+ "打脸": "slap-face",
+ "哇": "wow",
+ "翻白眼": "eye-roll",
+ "666": "666",
+ "让我看看": "let-me-see",
+ "叹气": "sigh",
+ "苦涩": "bitter",
+ "裂开": "crack",
+ "奸笑": "wicked-smile"
+ },
+ "gesture": {
+ "握手": "handshake",
+ "胜利": "victory",
+ "抱拳": "fist-salute",
+ "勾引": "beckon",
+ "拳头": "fist",
+ "OK": "ok",
+ "合十": "pray",
+ "强": "strong",
+ "拥抱": "hug",
+ "弱": "weak"
+ },
+ "animal": {
+ "猪头": "pig-head",
+ "跳跳": "jump",
+ "发抖": "shiver",
+ "转圈": "spin"
+ },
+ "blessing": {
+ "庆祝": "celebrate",
+ "礼物": "gift",
+ "红包": "red-envelope",
+ "發": "fortune",
+ "福": "blessing",
+ "烟花": "fireworks",
+ "爆竹": "firecrackers"
+ },
+ "other": {
+ "嘴唇": "lips",
+ "爱心": "heart",
+ "心碎": "broken-heart",
+ "啤酒": "beer",
+ "咖啡": "coffee",
+ "蛋糕": "cake",
+ "凋谢": "wither",
+ "菜刀": "knife",
+ "炸弹": "bomb",
+ "便便": "poop",
+ "太阳": "sun",
+ "月亮": "moon",
+ "玫瑰": "rose"
+ }
+}
diff --git a/Touchkebao/index.html b/Touchkebao/index.html
index 16de6c67..92656ef9 100644
--- a/Touchkebao/index.html
+++ b/Touchkebao/index.html
@@ -3,7 +3,7 @@
-
存客宝
+
触客宝