Compare commits
10 Commits
a7370d4e8c
...
d8520e72ec
| Author | SHA1 | Date | |
|---|---|---|---|
| d8520e72ec | |||
| e24a04098c | |||
| cf434cf930 | |||
| 38f7b2d550 | |||
| 7b81f6b824 | |||
| b76320a3e7 | |||
| 26cd7f7e8f | |||
| 36f93db93f | |||
| d2d96ab315 | |||
| d1a47297bf |
8
.env.development
Normal file
8
.env.development
Normal file
@ -0,0 +1,8 @@
|
||||
# APP ID
|
||||
NEXT_PUBLIC_APP_ID=c36db3aa-20a6-4421-8e62-c9af03020088
|
||||
# APP API key
|
||||
NEXT_PUBLIC_APP_KEY=app-WN8APQeButq9jIRj2g5D7r22
|
||||
# API url prefix
|
||||
NEXT_PUBLIC_API_URL=http://192.168.6.35:180/v1
|
||||
|
||||
NEXT_PUBLIC_BASE_API_URL=http://127.0.0.1:8085
|
||||
@ -1,8 +0,0 @@
|
||||
# APP ID
|
||||
NEXT_PUBLIC_APP_ID=8f005d85-a520-4b64-82d7-09f76104cc80
|
||||
# APP API key
|
||||
NEXT_PUBLIC_APP_KEY=app-9o5BfmyoyKiNui9Pe855xasf
|
||||
# API url prefix
|
||||
NEXT_PUBLIC_API_URL=http://192.168.6.37:180/v1
|
||||
|
||||
NEXT_PUBLIC_BASE_API_URL=http://192.168.6.9:8085
|
||||
8
.env.production
Normal file
8
.env.production
Normal file
@ -0,0 +1,8 @@
|
||||
# APP ID
|
||||
NEXT_PUBLIC_APP_ID=c36db3aa-20a6-4421-8e62-c9af03020088
|
||||
# APP API key
|
||||
NEXT_PUBLIC_APP_KEY=app-WN8APQeButq9jIRj2g5D7r22
|
||||
# API url prefix
|
||||
NEXT_PUBLIC_API_URL=http://192.168.6.35:180/v1
|
||||
|
||||
NEXT_PUBLIC_BASE_API_URL=http://192.168.6.35:8088/ruoyi-admin
|
||||
@ -1,28 +0,0 @@
|
||||
{
|
||||
"extends": [
|
||||
"@antfu",
|
||||
"plugin:react-hooks/recommended"
|
||||
],
|
||||
"rules": {
|
||||
"@typescript-eslint/consistent-type-definitions": [
|
||||
"error",
|
||||
"type"
|
||||
],
|
||||
"no-console": "off",
|
||||
"indent": "off",
|
||||
"@typescript-eslint/indent": [
|
||||
"error",
|
||||
2,
|
||||
{
|
||||
"SwitchCase": 1,
|
||||
"flatTernaryExpressions": false,
|
||||
"ignoredNodes": [
|
||||
"PropertyDefinition[decorators]",
|
||||
"TSUnionType",
|
||||
"FunctionExpression[params]:has(Identifier[decorators])"
|
||||
]
|
||||
}
|
||||
],
|
||||
"react-hooks/exhaustive-deps": "warn"
|
||||
}
|
||||
}
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -48,7 +48,7 @@ yarn.lock
|
||||
.yarnrc.yml
|
||||
|
||||
# pmpm
|
||||
pnpm-lock.yaml
|
||||
# pnpm-lock.yaml
|
||||
|
||||
# info
|
||||
keys.ts
|
||||
|
||||
@ -4,9 +4,11 @@ WORKDIR /app
|
||||
|
||||
COPY . .
|
||||
|
||||
RUN yarn install
|
||||
RUN yarn build
|
||||
RUN npm install -g pnpm
|
||||
RUN npm config set registry https://registry.npmmirror.com
|
||||
RUN pnpm install
|
||||
RUN pnpm build
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
CMD ["yarn","start"]
|
||||
CMD ["pnpm","start"]
|
||||
|
||||
@ -1,12 +1,17 @@
|
||||
import { type NextRequest } from 'next/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
import { client, getInfo } from '@/app/api/utils/common'
|
||||
import { type NextRequest } from "next/server";
|
||||
import { NextResponse } from "next/server";
|
||||
import { client, getInfo } from "@/app/api/utils/common";
|
||||
|
||||
export async function POST(request: NextRequest, { params }: {
|
||||
params: { taskId: string }
|
||||
}) {
|
||||
const { taskId } = await params
|
||||
const { user } = getInfo(request)
|
||||
const { data } = await client.stopChat(taskId, user)
|
||||
return NextResponse.json(data)
|
||||
export async function POST(
|
||||
request: NextRequest,
|
||||
{
|
||||
params,
|
||||
}: {
|
||||
params: Promise<{ taskId: string }>;
|
||||
}
|
||||
) {
|
||||
const { taskId } = await params;
|
||||
const { user } = getInfo(request);
|
||||
const { data } = await client.stopChat(taskId, user);
|
||||
return NextResponse.json(data);
|
||||
}
|
||||
|
||||
@ -1,19 +1,26 @@
|
||||
import { type NextRequest } from 'next/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
import { client, getInfo } from '@/app/api/utils/common'
|
||||
import { type NextRequest } from "next/server";
|
||||
import { NextResponse } from "next/server";
|
||||
import { client, getInfo } from "@/app/api/utils/common";
|
||||
|
||||
export async function POST(request: NextRequest, { params }: {
|
||||
params: { conversationId: string }
|
||||
}) {
|
||||
const body = await request.json()
|
||||
const {
|
||||
auto_generate,
|
||||
name,
|
||||
} = body
|
||||
const { conversationId } = await params
|
||||
const { user } = getInfo(request)
|
||||
export async function POST(
|
||||
request: NextRequest,
|
||||
{
|
||||
params,
|
||||
}: {
|
||||
params: Promise<{ conversationId: string }>;
|
||||
}
|
||||
) {
|
||||
const body = await request.json();
|
||||
const { auto_generate, name } = body;
|
||||
const { conversationId } = await params;
|
||||
const { user } = getInfo(request);
|
||||
|
||||
// auto generate name
|
||||
const { data } = await client.renameConversation(conversationId, name, user, auto_generate)
|
||||
return NextResponse.json(data)
|
||||
const { data } = await client.renameConversation(
|
||||
conversationId,
|
||||
name,
|
||||
user,
|
||||
auto_generate
|
||||
);
|
||||
return NextResponse.json(data);
|
||||
}
|
||||
|
||||
@ -1,13 +1,18 @@
|
||||
import { type NextRequest } from 'next/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
import { client, getInfo } from '@/app/api/utils/common'
|
||||
import { type NextRequest } from "next/server";
|
||||
import { NextResponse } from "next/server";
|
||||
import { client, getInfo } from "@/app/api/utils/common";
|
||||
|
||||
export async function DELETE(request: NextRequest, { params }: {
|
||||
params: { conversationId: string }
|
||||
}) {
|
||||
const { conversationId } = await params
|
||||
const { user } = await getInfo(request)
|
||||
export async function DELETE(
|
||||
request: NextRequest,
|
||||
{
|
||||
params,
|
||||
}: {
|
||||
params: Promise<{ conversationId: string }>;
|
||||
}
|
||||
) {
|
||||
const { conversationId } = await params;
|
||||
const { user } = await getInfo(request);
|
||||
|
||||
const { data } = await client.deleteConversation(conversationId, user)
|
||||
return NextResponse.json(data)
|
||||
}
|
||||
const { data } = await client.deleteConversation(conversationId, user);
|
||||
return NextResponse.json(data);
|
||||
}
|
||||
|
||||
@ -1,35 +1,34 @@
|
||||
import { type NextRequest } from 'next/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
import { client, getInfo, setSession } from '@/app/api/utils/common'
|
||||
import { type NextRequest } from "next/server";
|
||||
import { NextResponse } from "next/server";
|
||||
import { client, getInfo, setSession } from "@/app/api/utils/common";
|
||||
|
||||
export async function GET(request: NextRequest) {
|
||||
const { sessionId, user } = getInfo(request)
|
||||
const { sessionId, user } = getInfo(request);
|
||||
try {
|
||||
const { data } = await client.getInfo(user)
|
||||
const { data } = await client.getInfo(user);
|
||||
// 接口未返回 建议从配置文件或者环境变量获取
|
||||
data.app_id = 'app_id'
|
||||
data.app_id = "app_id";
|
||||
data.site = {
|
||||
"title": "卓远智能问答",
|
||||
"chat_color_theme": null,
|
||||
"chat_color_theme_inverted": false,
|
||||
"icon_type": "image",
|
||||
"icon": "48159ee8",
|
||||
"icon_background": "#E4FBCC",
|
||||
"icon_url": "/files/aaa.png",
|
||||
"description": "Zhuoyuan AI Helper",
|
||||
"copyright": null,
|
||||
"privacy_policy": null,
|
||||
"custom_disclaimer": "",
|
||||
"default_language": "zh-Hans",
|
||||
"prompt_public": false,
|
||||
"show_workflow_steps": true,
|
||||
"use_icon_as_answer_icon": false
|
||||
}
|
||||
title: "ERP问答助手",
|
||||
chat_color_theme: null,
|
||||
chat_color_theme_inverted: false,
|
||||
icon_type: "image",
|
||||
icon: "48159ee8",
|
||||
icon_background: "#E4FBCC",
|
||||
icon_url: "/files/aaa.png",
|
||||
description: "Zhuoyuan AI Helper",
|
||||
copyright: null,
|
||||
privacy_policy: null,
|
||||
custom_disclaimer: "",
|
||||
default_language: "zh-Hans",
|
||||
prompt_public: false,
|
||||
show_workflow_steps: true,
|
||||
use_icon_as_answer_icon: false,
|
||||
};
|
||||
return NextResponse.json(data as object, {
|
||||
headers: setSession(sessionId),
|
||||
})
|
||||
}
|
||||
catch (error) {
|
||||
return NextResponse.json([])
|
||||
});
|
||||
} catch (error) {
|
||||
return NextResponse.json([]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,16 +1,19 @@
|
||||
import { type NextRequest } from 'next/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
import { client, getInfo } from '@/app/api/utils/common'
|
||||
import { type NextRequest } from "next/server";
|
||||
import { NextResponse } from "next/server";
|
||||
import { client, getInfo } from "@/app/api/utils/common";
|
||||
|
||||
export async function POST(request: NextRequest, { params }: {
|
||||
params: { messageId: string }
|
||||
}) {
|
||||
const body = await request.json()
|
||||
const {
|
||||
rating,
|
||||
} = body
|
||||
const { messageId } = await params
|
||||
const { user } = getInfo(request)
|
||||
const { data } = await client.messageFeedback(messageId, rating, user)
|
||||
return NextResponse.json(data)
|
||||
export async function POST(
|
||||
request: NextRequest,
|
||||
{
|
||||
params,
|
||||
}: {
|
||||
params: Promise<{ messageId: string }>;
|
||||
}
|
||||
) {
|
||||
const body = await request.json();
|
||||
const { rating } = body;
|
||||
const { messageId } = await params;
|
||||
const { user } = getInfo(request);
|
||||
const { data } = await client.messageFeedback(messageId, rating, user);
|
||||
return NextResponse.json(data);
|
||||
}
|
||||
|
||||
@ -1,10 +1,17 @@
|
||||
import { type NextRequest } from 'next/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
import { client, getInfo } from '@/app/api/utils/common'
|
||||
import { type NextRequest } from "next/server";
|
||||
import { NextResponse } from "next/server";
|
||||
import { client, getInfo } from "@/app/api/utils/common";
|
||||
|
||||
export async function GET(request: NextRequest, params: { messageId: string }) {
|
||||
const { messageId } = await params
|
||||
const { user } = getInfo(request)
|
||||
const { data }: any = await client.getSuggested(messageId, user,)
|
||||
return NextResponse.json(data)
|
||||
export async function GET(
|
||||
request: NextRequest,
|
||||
{
|
||||
params,
|
||||
}: {
|
||||
params: Promise<{ messageId: string }>;
|
||||
}
|
||||
) {
|
||||
const { messageId } = await params;
|
||||
const { user } = getInfo(request);
|
||||
const { data }: any = await client.getSuggested(messageId, user);
|
||||
return NextResponse.json(data);
|
||||
}
|
||||
|
||||
@ -1,20 +1,30 @@
|
||||
import { type NextRequest } from 'next/server'
|
||||
import { ChatClient } from 'dify-client-plus'
|
||||
import { v4 } from 'uuid'
|
||||
import { API_KEY, API_URL } from '@/config'
|
||||
import { type NextRequest } from "next/server";
|
||||
import { ChatClient } from "dify-client-plus";
|
||||
import { v4 } from "uuid";
|
||||
import { API_KEY, API_URL } from "@/config";
|
||||
|
||||
export const getInfo = (request: NextRequest) => {
|
||||
const username = request.cookies.get('username')?.value || 'no-user'
|
||||
const sessionId = request.cookies.get('session_id')?.value || v4()
|
||||
const user = `${username}`
|
||||
const username = request.cookies.get("username")?.value || "no-user";
|
||||
const sessionId = request.cookies.get("session_id")?.value || v4();
|
||||
const user = `${username}`;
|
||||
return {
|
||||
sessionId,
|
||||
user,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
export const setSession = (sessionId: string) => {
|
||||
return { 'Set-Cookie': `session_id=${sessionId}` }
|
||||
}
|
||||
return { "Set-Cookie": `session_id=${sessionId}` };
|
||||
};
|
||||
|
||||
export const client = new ChatClient(API_KEY, API_URL || undefined)
|
||||
export const client = new ChatClient(API_KEY, API_URL || undefined);
|
||||
|
||||
export function getCookieValue(cookieName: string): string | null {
|
||||
const cookies = document.cookie.split("; ").reduce((acc, cookie) => {
|
||||
const [name, value] = cookie.split("=");
|
||||
acc[name] = value;
|
||||
return acc;
|
||||
}, {} as Record<string, string>);
|
||||
|
||||
return cookies[cookieName] || null;
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ import { ToastContext } from '@/app/components/base/toast'
|
||||
import Loading from '@/app/components/base/loading'
|
||||
// import { fetchAgentLogDetail } from '@/service/log'
|
||||
// TODO
|
||||
const fetchAgentLogDetail = () => {
|
||||
const fetchAgentLogDetail: any = (data: any) => {
|
||||
console.log('TODO MARS')
|
||||
}
|
||||
|
||||
|
||||
@ -39,8 +39,7 @@ const AnswerIcon: FC<AnswerIconProps> = ({
|
||||
>
|
||||
{isValidImageIcon
|
||||
? <img src={imageUrl} className="w-full h-full rounded-full" alt="answer icon" />
|
||||
: (icon && icon !== '') ? <em-emoji id={icon} /> : <em-emoji id='🤖' />
|
||||
}
|
||||
: (icon && icon !== '') ? (<em-emoji id={icon} />) : (<em-emoji id='🤖' />) }
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
@ -4,7 +4,8 @@ import { t } from 'i18next'
|
||||
import { debounce } from 'lodash-es'
|
||||
import copy from 'copy-to-clipboard'
|
||||
import s from './style.module.css'
|
||||
import Tooltip from '@/app/components/base/tooltip'
|
||||
// import Tooltip from '@/app/components/base/tooltip'
|
||||
import { Tooltip } from 'antd';
|
||||
|
||||
type ICopyBtnProps = {
|
||||
value: string
|
||||
@ -31,8 +32,7 @@ const CopyBtn = ({
|
||||
return (
|
||||
<div className={`${className}`}>
|
||||
<Tooltip
|
||||
popupContent={(isCopied ? t('appApi.copied') : t('appApi.copy'))}
|
||||
asChild={false}
|
||||
title={(isCopied ? t('appApi.copied') : t('appApi.copy'))}
|
||||
>
|
||||
<div
|
||||
onMouseLeave={onMouseLeave}
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
'use client'
|
||||
import { t } from 'i18next'
|
||||
import { Refresh } from '@/app/components/base/icons/src/vender/line/general'
|
||||
import Tooltip from '@/app/components/base/tooltip'
|
||||
// import Tooltip from '@/app/components/base/tooltip'
|
||||
import { Tooltip } from 'antd';
|
||||
|
||||
type Props = {
|
||||
className?: string
|
||||
@ -12,7 +13,7 @@ const RegenerateBtn = ({ className, onClick }: Props) => {
|
||||
return (
|
||||
<div className={`${className}`}>
|
||||
<Tooltip
|
||||
popupContent={t('appApi.regenerate') as string}
|
||||
title={t('appApi.regenerate') as string}
|
||||
>
|
||||
<div
|
||||
className={'box-border p-0.5 flex items-center justify-center rounded-md bg-white cursor-pointer'}
|
||||
|
||||
@ -1,34 +1,52 @@
|
||||
import React, { useState } from 'react';
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { Modal, Checkbox, Input, message } from 'antd';
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
const { TextArea } = Input;
|
||||
|
||||
interface FeedbackModalProps {
|
||||
open: boolean;
|
||||
onOk: (selectedOption: number | null, feedbackText: string) => void;
|
||||
open: boolean;
|
||||
onOk: (selectedOption: number | null, feedbackText: string) => Promise<void>;
|
||||
onCancel: () => void;
|
||||
}
|
||||
|
||||
const FeedbackModal: React.FC<FeedbackModalProps> = ({ open, onOk, onCancel }) => {
|
||||
const [selectedOption, setSelectedOption] = useState<number | null>(null);
|
||||
const [feedbackText, setFeedbackText] = useState<string>('');
|
||||
const { t } = useTranslation()
|
||||
const [confirmLoading, setConfirmLoading] = useState(false);
|
||||
|
||||
const handleOk = () => {
|
||||
if (selectedOption === null || !feedbackText) {
|
||||
message.warning('请选择操作类型并填写反馈建议');
|
||||
useEffect(() => {
|
||||
if (open) {
|
||||
setFeedbackText('');
|
||||
}
|
||||
}, [open]);
|
||||
|
||||
const handleOk = async () => {
|
||||
if (!feedbackText) {
|
||||
message.warning('请填写反馈建议');
|
||||
return;
|
||||
}
|
||||
onOk(selectedOption, feedbackText);
|
||||
setConfirmLoading(true)
|
||||
try {
|
||||
await onOk(selectedOption, feedbackText);
|
||||
} finally {
|
||||
setConfirmLoading(false)
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal
|
||||
title="反馈"
|
||||
open={open}
|
||||
open={open}
|
||||
onOk={handleOk}
|
||||
onCancel={onCancel}
|
||||
okText={`${t('common.operation.confirm')}`}
|
||||
cancelText={`${t('common.operation.cancel')}`}
|
||||
confirmLoading={confirmLoading}
|
||||
>
|
||||
<div>
|
||||
{/* <div>
|
||||
<Checkbox
|
||||
checked={selectedOption === 0}
|
||||
onChange={() => setSelectedOption(0)}
|
||||
@ -41,7 +59,7 @@ const FeedbackModal: React.FC<FeedbackModalProps> = ({ open, onOk, onCancel }) =
|
||||
>
|
||||
修改
|
||||
</Checkbox>
|
||||
</div>
|
||||
</div> */}
|
||||
<TextArea
|
||||
rows={4}
|
||||
placeholder="请输入您的反馈建议"
|
||||
@ -52,4 +70,4 @@ const FeedbackModal: React.FC<FeedbackModalProps> = ({ open, onOk, onCancel }) =
|
||||
);
|
||||
};
|
||||
|
||||
export default FeedbackModal;
|
||||
export default FeedbackModal;
|
||||
|
||||
@ -46,7 +46,7 @@ export type ChatWithHistoryContextValue = {
|
||||
isMobile: boolean
|
||||
isInstalledApp: boolean
|
||||
appId?: string
|
||||
handleFeedback: (messageId: string, feedback: Feedback) => void
|
||||
handleFeedback: (messageId: string, feedback: Feedback) => Promise<boolean>
|
||||
currentChatInstanceRef: RefObject<{ handleStop: () => void }>
|
||||
themeBuilder?: ThemeBuilder
|
||||
}
|
||||
@ -73,7 +73,7 @@ export const ChatWithHistoryContext = createContext<ChatWithHistoryContextValue>
|
||||
chatShouldReloadKey: '',
|
||||
isMobile: false,
|
||||
isInstalledApp: false,
|
||||
handleFeedback: () => { },
|
||||
handleFeedback: () => new Promise(() => { }),
|
||||
currentChatInstanceRef: { current: { handleStop: () => { } } },
|
||||
})
|
||||
export const useChatWithHistoryContext = () => useContext(ChatWithHistoryContext)
|
||||
|
||||
@ -4,7 +4,7 @@ import useSWR from "swr";
|
||||
import { useLocalStorageState } from "ahooks";
|
||||
import { produce } from "immer";
|
||||
import { message } from "antd";
|
||||
import { client, getInfo } from "@/app/api/utils/common";
|
||||
import { client, getCookieValue } from "@/app/api/utils/common";
|
||||
import type { Callback, ChatConfig, ChatItem, Feedback } from "../types";
|
||||
import { CONVERSATION_ID_INFO } from "../constants";
|
||||
import { buildChatItemTree } from "../utils";
|
||||
@ -537,16 +537,43 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
|
||||
setCurrentConversationIdForFeedback,
|
||||
] = useState<string | null>(null);
|
||||
|
||||
const [resolveFeedback, setResolveFeedback] = useState<(value: boolean | PromiseLike<boolean>) => void | null>(null);
|
||||
const [isSubmittingNow, setIsSubmittingNow] = useState(false); // 防止重复提交
|
||||
const handleFeedback = useCallback(
|
||||
(messageId: string, feedback: Feedback, conversationId: string) => {
|
||||
async (messageId: string, feedback: Feedback, conversationId: string) => {
|
||||
console.log('feedback.rating ', feedback.rating);
|
||||
|
||||
setCurrentMessageId(messageId);
|
||||
setCurrentFeedback(feedback);
|
||||
setCurrentConversationIdForFeedback(conversationId);
|
||||
setIsFeedbackModalVisible(true);
|
||||
|
||||
if (feedback.rating === 'like') {
|
||||
setIsSubmittingNow(true)
|
||||
|
||||
return true
|
||||
} else if (!feedback.rating) {
|
||||
setIsSubmittingNow(true)
|
||||
|
||||
return true
|
||||
} else
|
||||
{
|
||||
return new Promise<boolean>(async (resolve) => {
|
||||
console.log('handleFeedback', messageId, feedback, conversationId);
|
||||
setIsFeedbackModalVisible(true);
|
||||
setResolveFeedback(() => resolve);
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
[]
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (isSubmittingNow) {
|
||||
handleFeedbackSubmit(null, '')
|
||||
}
|
||||
}, [])
|
||||
|
||||
const handleFeedbackSubmit = useCallback(
|
||||
async (selectedOption: number | null, feedbackText: string) => {
|
||||
console.log(currentMessageId);
|
||||
@ -555,16 +582,16 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
|
||||
try {
|
||||
// 构造请求参数
|
||||
const requestBody = {
|
||||
operationType: selectedOption, // 0 或 1
|
||||
operationType: currentFeedback!.rating, // 0 或 1
|
||||
feedbackText, // 用户反馈建议
|
||||
conversationId: '89fba8a7-e4e2-4167-8b7c-b3c103797053', // 会话 ID
|
||||
conversationId: currentConversationId, // 会话 ID
|
||||
messageId: currentMessageId, // 消息 ID
|
||||
username: "user_admin", // 用户名
|
||||
username: getCookieValue('username'), // 用户名
|
||||
};
|
||||
|
||||
// 调用 Java 接口
|
||||
const javaResponse = await fetch(
|
||||
`${process.env.NEXT_PUBLIC_BASE_API_URL}/api/conversation/feedback`,
|
||||
`/dev-api/api/conversation/feedback`,
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
@ -578,26 +605,33 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
|
||||
await updateFeedback(
|
||||
{
|
||||
url: `/messages/${currentMessageId}/feedbacks`,
|
||||
body: { rating: currentFeedback.rating },
|
||||
body: { rating: currentFeedback!.rating },
|
||||
},
|
||||
isInstalledApp,
|
||||
appId
|
||||
// isInstalledApp,
|
||||
// appId
|
||||
);
|
||||
|
||||
// 显示成功通知
|
||||
notify({ type: "success", message: t("common.api.success") });
|
||||
|
||||
if (resolveFeedback) {
|
||||
resolveFeedback(true); // 用户取消了反馈
|
||||
setResolveFeedback(null);
|
||||
}
|
||||
|
||||
// 关闭对话框
|
||||
setIsFeedbackModalVisible(false);
|
||||
} catch (error) {
|
||||
console.error("Error:", error);
|
||||
notify({ type: "error", message: t("common.api.failed") });
|
||||
} finally {
|
||||
setIsSubmittingNow(false);
|
||||
}
|
||||
},
|
||||
[
|
||||
currentMessageId,
|
||||
currentFeedback,
|
||||
currentConversationIdForFeedback,
|
||||
currentConversationId,
|
||||
isInstalledApp,
|
||||
appId,
|
||||
notify,
|
||||
@ -649,7 +683,13 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
|
||||
<FeedbackModal
|
||||
open={isFeedbackModalVisible}
|
||||
onOk={handleFeedbackSubmit}
|
||||
onCancel={() => setIsFeedbackModalVisible(false)}
|
||||
onCancel={() => {
|
||||
if (resolveFeedback) {
|
||||
resolveFeedback(false); // 用户取消了反馈
|
||||
setResolveFeedback(null);
|
||||
}
|
||||
setIsFeedbackModalVisible(false)
|
||||
}}
|
||||
/>
|
||||
),
|
||||
};
|
||||
|
||||
@ -199,7 +199,7 @@ const ChatWithHistoryWrapWithCheckToken: FC<ChatWithHistoryWrapProps> = ({
|
||||
if (!accessToken) {
|
||||
router.replace("/login");
|
||||
} else {
|
||||
fetch(`${process.env.NEXT_PUBLIC_BASE_API_URL}/getInfo`, {
|
||||
fetch(`/dev-api/getInfo`, {
|
||||
method: "GET",
|
||||
headers: {
|
||||
Authorization: `Bearer ${accessToken}`,
|
||||
|
||||
@ -3,6 +3,7 @@ import {
|
||||
memo,
|
||||
useMemo,
|
||||
useState,
|
||||
useCallback
|
||||
} from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import type { ChatItem } from '../../types'
|
||||
@ -19,8 +20,9 @@ import {
|
||||
ThumbsDown,
|
||||
ThumbsUp,
|
||||
} from '@/app/components/base/icons/src/vender/line/alertsAndFeedback'
|
||||
import Tooltip from '@/app/components/base/tooltip'
|
||||
// import Tooltip from '@/app/components/base/tooltip'
|
||||
import Log from '@/app/components/chat/log'
|
||||
import { message, Popconfirm, Tooltip } from 'antd';
|
||||
|
||||
interface OperationProps {
|
||||
item: ChatItem
|
||||
@ -75,10 +77,19 @@ const Operation: FC<OperationProps> = ({
|
||||
if (!config?.supportFeedback || !onFeedback)
|
||||
return
|
||||
|
||||
await onFeedback?.(id, { rating })
|
||||
setLocalFeedback({ rating })
|
||||
if (await onFeedback?.(id, { rating })) {
|
||||
setLocalFeedback({ rating })
|
||||
}
|
||||
}
|
||||
|
||||
const confirmCancelCallback = useCallback(async () => {
|
||||
try {
|
||||
await handleFeedback(null)
|
||||
} finally {
|
||||
message.success(localFeedback!.rating === 'like' ? `${t('appDebug.operation.cancelAgree')}成功` : `${t('appDebug.operation.cancelDisagree')}成功`)
|
||||
}
|
||||
}, [handleFeedback])
|
||||
|
||||
const operationWidth = useMemo(() => {
|
||||
let width = 0
|
||||
if (!isOpeningStatement)
|
||||
@ -138,7 +149,7 @@ const Operation: FC<OperationProps> = ({
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{/*
|
||||
{/*
|
||||
{(!isOpeningStatement && config?.supportAnnotation && config.annotation_reply?.enabled) && (
|
||||
<AnnotationCtrlBtn
|
||||
appId={config?.appId || ''}
|
||||
@ -170,7 +181,7 @@ const Operation: FC<OperationProps> = ({
|
||||
{
|
||||
config?.supportFeedback && !localFeedback?.rating && onFeedback && !isOpeningStatement && (
|
||||
<div className='hidden group-hover:flex shrink-0 items-center px-0.5 bg-white border-[0.5px] border-gray-100 shadow-md text-gray-500 rounded-lg'>
|
||||
<Tooltip popupContent={t('appDebug.operation.agree')}>
|
||||
<Tooltip title={t('appDebug.operation.agree')}>
|
||||
<div
|
||||
className='flex items-center justify-center mr-0.5 w-6 h-6 rounded-md hover:bg-black/5 hover:text-gray-800 cursor-pointer'
|
||||
onClick={() => handleFeedback('like')}
|
||||
@ -179,7 +190,7 @@ const Operation: FC<OperationProps> = ({
|
||||
</div>
|
||||
</Tooltip>
|
||||
<Tooltip
|
||||
popupContent={t('appDebug.operation.disagree')}
|
||||
title={t('appDebug.operation.disagree')}
|
||||
>
|
||||
<div
|
||||
className='flex items-center justify-center w-6 h-6 rounded-md hover:bg-black/5 hover:text-gray-800 cursor-pointer'
|
||||
@ -194,27 +205,37 @@ const Operation: FC<OperationProps> = ({
|
||||
{
|
||||
config?.supportFeedback && localFeedback?.rating && onFeedback && !isOpeningStatement && (
|
||||
<Tooltip
|
||||
popupContent={localFeedback.rating === 'like' ? t('appDebug.operation.cancelAgree') : t('appDebug.operation.cancelDisagree')}
|
||||
title={localFeedback.rating === 'like' ? t('appDebug.operation.cancelAgree') : t('appDebug.operation.cancelDisagree')}
|
||||
>
|
||||
<div
|
||||
className={`
|
||||
flex items-center justify-center w-7 h-7 rounded-[10px] border-[2px] border-white cursor-pointer
|
||||
${localFeedback.rating === 'like' && 'bg-blue-50 text-blue-600'}
|
||||
${localFeedback.rating === 'dislike' && 'bg-red-100 text-red-600'}
|
||||
`}
|
||||
onClick={() => handleFeedback(null)}
|
||||
<Popconfirm
|
||||
title={localFeedback.rating === 'like' ? t('appDebug.operation.cancelAgree') : t('appDebug.operation.cancelDisagree')}
|
||||
description={localFeedback.rating === 'like' ? `是否${t('appDebug.operation.cancelAgree')}?` : `是否${t('appDebug.operation.cancelDisagree')}?`}
|
||||
onConfirm={confirmCancelCallback}
|
||||
okText={`${t('common.operation.confirm')}`}
|
||||
cancelText={`${t('common.operation.cancel')}`}
|
||||
>
|
||||
{
|
||||
localFeedback.rating === 'like' && (
|
||||
<ThumbsUp className='w-4 h-4' />
|
||||
)
|
||||
}
|
||||
{
|
||||
localFeedback.rating === 'dislike' && (
|
||||
<ThumbsDown className='w-4 h-4' />
|
||||
)
|
||||
}
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
className={`
|
||||
flex items-center justify-center w-7 h-7 rounded-[10px] border-[2px] border-white cursor-pointer
|
||||
${localFeedback.rating === 'like' && 'bg-blue-50 text-blue-600'}
|
||||
${localFeedback.rating === 'dislike' && 'bg-red-100 text-red-600'}
|
||||
`}
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
{
|
||||
localFeedback.rating === 'like' && (
|
||||
<ThumbsUp className='w-4 h-4' />
|
||||
)
|
||||
}
|
||||
{
|
||||
localFeedback.rating === 'dislike' && (
|
||||
<ThumbsDown className='w-4 h-4' />
|
||||
)
|
||||
}
|
||||
</button>
|
||||
|
||||
</Popconfirm>
|
||||
</Tooltip>
|
||||
)
|
||||
}
|
||||
|
||||
@ -60,7 +60,7 @@ export type ChatProps = {
|
||||
onAnnotationAdded?: (annotationId: string, authorName: string, question: string, answer: string, index: number) => void
|
||||
onAnnotationRemoved?: (index: number) => void
|
||||
chatNode?: ReactNode
|
||||
onFeedback?: (messageId: string, feedback: Feedback) => void
|
||||
onFeedback?: (messageId: string, feedback: Feedback) => Promise<boolean>
|
||||
chatAnswerContainerInner?: string
|
||||
hideProcessDetail?: boolean
|
||||
hideLogModal?: boolean
|
||||
|
||||
@ -1,70 +1,70 @@
|
||||
'use client'
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
|
||||
export default function LoginPage() {
|
||||
const [username, setUsername] = useState('')
|
||||
const [password, setPassword] = useState('')
|
||||
const [error, setError] = useState('')
|
||||
const router = useRouter()
|
||||
const [loading, setLoading] = useState(false) // 新增加载状态
|
||||
|
||||
const handleLogin = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
setLoading(true) // 开始加载
|
||||
fetch(`${process.env.NEXT_PUBLIC_BASE_API_URL}/login`, {
|
||||
method: 'post',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ username, password }),
|
||||
}).then(res => res.json()).then(data => {
|
||||
if (data.code === 200) {
|
||||
localStorage.setItem('token', data.token)
|
||||
document.cookie = `username=${username}; path=/` // 新增cookie设置
|
||||
router.push('/')
|
||||
} else {
|
||||
setError('登录失败,请检查凭证')
|
||||
setLoading(false)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-gray-100 flex items-center justify-center">
|
||||
<div className="bg-white p-8 rounded-lg shadow-md w-96">
|
||||
<h1 className="text-2xl font-bold mb-6 text-center">Login</h1>
|
||||
<form onSubmit={handleLogin}>
|
||||
<div className="mb-4">
|
||||
<label className="block text-sm font-medium mb-1">Username</label>
|
||||
<input
|
||||
type="text"
|
||||
className="w-full px-3 py-2 border rounded-md"
|
||||
value={username}
|
||||
onChange={e => setUsername(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<div className="mb-6">
|
||||
<label className="block text-sm font-medium mb-1">Password</label>
|
||||
<input
|
||||
type="password"
|
||||
className="w-full px-3 py-2 border rounded-md"
|
||||
value={password}
|
||||
onChange={e => setPassword(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
{error && <p className="text-red-500 text-sm mb-4">{error}</p>}
|
||||
<button
|
||||
type="submit"
|
||||
disabled={loading} // 禁用按钮
|
||||
className={`w-full bg-blue-500 text-white py-2 px-4 rounded-md transition-colors ${!loading && 'hover:bg-blue-600'}`}
|
||||
>
|
||||
{loading ? 'Loading...' : 'Sign In'}
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
'use client'
|
||||
import { useState } from 'react'
|
||||
import { useRouter } from 'next/navigation'
|
||||
|
||||
export default function LoginPage() {
|
||||
const [username, setUsername] = useState('')
|
||||
const [password, setPassword] = useState('')
|
||||
const [error, setError] = useState('')
|
||||
const router = useRouter()
|
||||
const [loading, setLoading] = useState(false) // 新增加载状态
|
||||
|
||||
const handleLogin = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
setLoading(true) // 开始加载
|
||||
fetch(`/dev-api/login`, {
|
||||
method: 'post',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ username, password }),
|
||||
}).then(res => res.json()).then(data => {
|
||||
if (data.code === 200) {
|
||||
localStorage.setItem('token', data.token)
|
||||
document.cookie = `username=${username}; path=/` // 新增cookie设置
|
||||
router.push('/')
|
||||
} else {
|
||||
setError('登录失败,请检查凭证')
|
||||
setLoading(false)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-gray-100 flex items-center justify-center">
|
||||
<div className="bg-white p-8 rounded-lg shadow-md w-96">
|
||||
<h1 className="text-2xl font-bold mb-6 text-center">Login</h1>
|
||||
<form onSubmit={handleLogin}>
|
||||
<div className="mb-4">
|
||||
<label className="block text-sm font-medium mb-1">Username</label>
|
||||
<input
|
||||
type="text"
|
||||
className="w-full px-3 py-2 border rounded-md"
|
||||
value={username}
|
||||
onChange={e => setUsername(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<div className="mb-6">
|
||||
<label className="block text-sm font-medium mb-1">Password</label>
|
||||
<input
|
||||
type="password"
|
||||
className="w-full px-3 py-2 border rounded-md"
|
||||
value={password}
|
||||
onChange={e => setPassword(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
{error && <p className="text-red-500 text-sm mb-4">{error}</p>}
|
||||
<button
|
||||
type="submit"
|
||||
disabled={loading} // 禁用按钮
|
||||
className={`w-full bg-blue-500 text-white py-2 px-4 rounded-md transition-colors ${!loading && 'hover:bg-blue-600'}`}
|
||||
>
|
||||
{loading ? 'Loading...' : 'Sign In'}
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ import React from 'react'
|
||||
|
||||
import type { IMainProps } from '@/app/components'
|
||||
import ChatWithHistoryWrapWithCheckToken from '@/app/components/chat-with-history'
|
||||
import '@ant-design/v5-patch-for-react-19';
|
||||
|
||||
const App: FC<IMainProps> = ({
|
||||
params,
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
@import "preflight.css";
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
|
||||
@import '../../themes/light.css';
|
||||
@import '../../themes/dark.css';
|
||||
@import "../../themes/manual-light.css";
|
||||
@import "../../themes/manual-dark.css";
|
||||
@import "../components/base/button/index.css";
|
||||
@import "../components/base/action-button/index.css";
|
||||
@import "../components/base/modal/index.css";
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
|
||||
html {
|
||||
color-scheme: light;
|
||||
@ -680,8 +682,4 @@ button:focus-within {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@import "../components/base/button/index.css";
|
||||
@import "../components/base/action-button/index.css";
|
||||
@import "../components/base/modal/index.css";
|
||||
|
||||
@tailwind utilities;
|
||||
@tailwind utilities;
|
||||
|
||||
32
eslint.config.js
Normal file
32
eslint.config.js
Normal file
@ -0,0 +1,32 @@
|
||||
const antfu = require('@antfu/eslint-config').default
|
||||
|
||||
// module.exports = antfu()
|
||||
|
||||
export default {
|
||||
extends: [
|
||||
'@antfu',
|
||||
'plugin:react-hooks/recommended',
|
||||
],
|
||||
rules: {
|
||||
'@typescript-eslint/consistent-type-definitions': [
|
||||
'error',
|
||||
'type',
|
||||
],
|
||||
'no-console': 'off',
|
||||
'indent': 'off',
|
||||
'@typescript-eslint/indent': [
|
||||
'error',
|
||||
2,
|
||||
{
|
||||
SwitchCase: 1,
|
||||
flatTernaryExpressions: false,
|
||||
ignoredNodes: [
|
||||
'PropertyDefinition[decorators]',
|
||||
'TSUnionType',
|
||||
'FunctionExpression[params]:has(Identifier[decorators])',
|
||||
],
|
||||
},
|
||||
],
|
||||
'react-hooks/exhaustive-deps': 'warn',
|
||||
},
|
||||
}
|
||||
@ -1,32 +1,44 @@
|
||||
/** @type {import('next').NextConfig} */
|
||||
const nextConfig = {
|
||||
eslint: {
|
||||
// Warning: This allows production builds to successfully complete even if
|
||||
// your project has ESLint errors.
|
||||
ignoreDuringBuilds: true,
|
||||
},
|
||||
typescript: {
|
||||
// !! WARN !!
|
||||
// Dangerously allow production builds to successfully complete even if
|
||||
// your project has type errors.
|
||||
// !! WARN !!
|
||||
ignoreBuildErrors: true,
|
||||
},
|
||||
reactStrictMode: true,
|
||||
// 压缩优化(Next.js 13+默认启用SWC,无需手动配置)
|
||||
compress: true,
|
||||
|
||||
// 图片优化
|
||||
images: {
|
||||
formats: ["image/avif", "image/webp"],
|
||||
domains: ["cdn.yourdomain.com"],
|
||||
formats: ['image/avif', 'image/webp'],
|
||||
domains: ['cdn.yourdomain.com'],
|
||||
},
|
||||
|
||||
// 修正后的开发指示器配置
|
||||
devIndicators: {
|
||||
position: "bottom-right", // 新版统一用position
|
||||
position: 'bottom-right', // 新版统一用position
|
||||
},
|
||||
|
||||
// 页面扩展名
|
||||
pageExtensions: ["ts", "tsx", "js", "jsx", "md", "mdx"],
|
||||
pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'],
|
||||
|
||||
// 路由重写
|
||||
async rewrites() {
|
||||
return [
|
||||
{
|
||||
source: "/dev-api/:path*",
|
||||
destination: "http://192.168.6.9:8085/:path*",
|
||||
source: '/dev-api/:path*',
|
||||
destination: `${process.env.NEXT_PUBLIC_BASE_API_URL}/:path*`,
|
||||
},
|
||||
];
|
||||
]
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = nextConfig;
|
||||
module.exports = nextConfig
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
]
|
||||
},
|
||||
"dependencies": {
|
||||
"@ant-design/v5-patch-for-react-19": "^1.0.3",
|
||||
"@emoji-mart/data": "^1.2.1",
|
||||
"@floating-ui/react": "^0.27.3",
|
||||
"@formatjs/intl-localematcher": "^0.5.10",
|
||||
@ -51,6 +52,7 @@
|
||||
"@types/react-dom": "^19.0.3",
|
||||
"@types/react-syntax-highlighter": "^15.5.13",
|
||||
"ahooks": "^3.8.4",
|
||||
"antd": "^5.26.4",
|
||||
"axios": "^1.7.9",
|
||||
"class-variance-authority": "^0.7.1",
|
||||
"classnames": "^2.5.1",
|
||||
|
||||
10497
pnpm-lock.yaml
generated
Normal file
10497
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user