chore: version 2.6.1

fix: 手动打包 Proxy 问题(#91 )
* perf: 检查代码 * feat: proxy setting * chore: 调整为测试环境使用 `proxy`
2025-07-23 05:53:42 +00:00 · 2023-02-22 14:43:55 +08:00 · 2023-02-22 14:29:05 +08:00 · 2023-02-22 10:40:26 +08:00 · 2023-02-22 10:36:11 +08:00 · 2023-02-21 15:26:23 +08:00
30 changed files with 426 additions and 84 deletions
--- a/.env
+++ b/.env
@@ -1,4 +1,5 @@
 # Glob API URL
-VITE_GLOB_API_URL=/api
+VITE_GLOB_API_URL=http://localhost:3002

-VITE_APP_API_BASE_URL=http://localhost:3002/
+# Glob API Timeout (ms)
+VITE_GLOB_API_TIMEOUT=100000
--- a/.env.development
+++ b/.env.development
@@ -0,0 +1 @@
+VITE_GLOB_HTTP_PROXY=Y
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -25,6 +25,7 @@
    "chatgpt",
    "chenzhaoyu",
    "commitlint",
+    "davinci",
    "dockerhub",
    "esno",
    "GPTAPI",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,41 @@
+## v2.6.1
+
+`2023-02-22`
+
+### Feature
+- 新增 `Railway` 部署模版
+
+### BugFix
+- 手动打包 `Proxy` 问题
+
+## v2.6.0
+
+`2023-02-21`
+### Feature
+- 新增对 `网页 accessToken` 调用 `ChatGPT`，更智能不过不太稳定 [#51](https://github.com/Chanzhaoyu/chatgpt-web/issues/51)
+- 前端页面设置按钮显示查看当前后端服务配置
+
+### Enhancement
+- 新增 `TIMEOUT_MS` 环境变量设定后端超时时常（单位：毫秒）[#62](https://github.com/Chanzhaoyu/chatgpt-web/issues/62)
+
+## v2.5.2
+
+`2023-02-21`
+### Feature
+- 增加对 `markdown` 格式的支持 [Demo](https://github.com/Chanzhaoyu/chatgpt-web/pull/77)
+### BugFix
+- 重载会话时滚动条保持
+
 ## v2.5.1

 `2023-02-21`
+
 ### Enhancement
 - 调整路由模式为 `hash`
- 调整新增会话添加到列表最前
+- 调整新增会话添加到
 - 调整移动端样式

+
 ## v2.5.0

 `2023-02-20`
--- a/README.md
+++ b/README.md
@@ -1,18 +1,73 @@
 # ChatGPT Web

-使用 express 和 vue3 搭建的 ChartGPT 演示网页
+> 使用 `express` 和 `vue3` 搭建的支持 `ChatGPT` 双模型演示网页

-![PC](./docs/cover.png)
+![cover](./docs/cover.png)
+![cover2](./docs/cover2.png)

-> 提示：目前 `OpenAI` 开放的模型最高只有 `GPT-3`，和现在网页所使用的 `GPT-3.5` 或 `GPT-4` 有很大差距，需要等官方开放最新的模型接口。
+- [ChatGPT Web](#chatgpt-web)
+	- [介绍](#介绍)
+	- [待实现路线](#待实现路线)
+	- [前置要求](#前置要求)
+		- [Node](#node)
+		- [PNPM](#pnpm)
+		- [填写密钥](#填写密钥)
+	- [安装依赖](#安装依赖)
+		- [后端](#后端)
+		- [前端](#前端)
+	- [测试环境运行](#测试环境运行)
+		- [后端服务](#后端服务)
+		- [前端网页](#前端网页)
+	- [打包](#打包)
+		- [使用 Docker](#使用-docker)
+			- [Docker 参数示例](#docker-参数示例)
+			- [Docker build \& Run](#docker-build--run)
+			- [Docker compose](#docker-compose)
+		- [使用 Railway 部署](#使用-railway-部署)
+			- [Railway 环境变量](#railway-环境变量)
+		- [手动打包](#手动打包)
+			- [后端服务](#后端服务-1)
+			- [前端网页](#前端网页-1)
+	- [常见问题](#常见问题)
+	- [参与贡献](#参与贡献)
+	- [License](#license)
+## 介绍
+
+支持双模型，提供了两种非官方 `ChatGPT API` 方法
+
+|  方式   | 免费？  | 可靠性  | 质量 |
+|  ----  | ----  | ----  | ----  |
+| `ChatGPTAPI(GPT-3)`  | 否 | 	可靠 | 较笨 |
+| `ChatGPTUnofficialProxyAPI(网页 accessToken)`  | 	是 |  不可靠 | 聪明 |
+
+***Note:*** 网页 `accessToken` 存在大约 8 小时，而且国内地区网络问题更推荐使用 `GPT-3` 的方式
+
+对比：
+1. `ChatGPTAPI` 使用 `text-davinci-003` 通过官方`OpenAI`补全`API`模拟`ChatGPT`（最稳健的方法，但它不是免费的，并且没有使用针对聊天进行微调的模型）
+2. `ChatGPTUnofficialProxyAPI` 使用非官方代理服务器访问 `ChatGPT` 的后端`API`，绕过`Cloudflare`（使用真实的的`ChatGPT`，非常轻量级，但依赖于第三方服务器，并且有速率限制）
+
+切换方式：
+1. 进入 `service/.env` 文件
+2. 使用 `OpenAI API Key` 请填写 `OPENAI_API_KEY` 字段 [(获取 apiKey)](https://platform.openai.com/overview)
+3. 使用 `Web API` 请填写 `OPENAI_ACCESS_TOKEN` 字段 [(获取 accessToken)](https://chat.openai.com/api/auth/session)
+4. 同时存在时以 `OpenAI API Key` 优先
+
+反向代理：
+
+`ChatGPTUnofficialProxyAPI`时可用 [详情](https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy)
+
+```shell
+# service/.env
+API_REVERSE_PROXY=
+```

 ## 待实现路线
+[✓] 双模型
+
 [✓] 多会话储存和上下文逻辑

 [✓] 对代码等消息类型的格式化美化处理

-[✗] 用户模块（注册、登录、个人中心）
-
 [✗] 界面多语言

 [✗] 界面主题
@@ -23,7 +78,7 @@

 ### Node

-`node` 需要 `^16 || ^18` 版本（或者 `node >= 14` 需要安装 [fetch polyfill](https://github.com/developit/unfetch#usage-as-a-polyfill)），使用 [nvm](https://github.com/nvm-sh/nvm) 可管理本地多个 `node` 版本
+`node` 需要 `^16 || ^18` 版本（`node >= 14` 需要安装 [fetch polyfill](https://github.com/developit/unfetch#usage-as-a-polyfill)），使用 [nvm](https://github.com/nvm-sh/nvm) 可管理本地多个 `node` 版本

 ```shell
 node -v
@@ -35,19 +90,24 @@ node -v
 npm install pnpm -g
 ```

-### OpenAI API Key
-注册并获取 [OpenAI API key](https://platform.openai.com/overview) 并填写到本地环境变量
+### 填写密钥
+获取 `Openai Api Key` 或 `accessToken` 并填写本地环境变量 [跳转](#介绍)
+
 ```
 # service/.env 文件

-OPENAI_API_KEY='Your key'
+# OpenAI API Key - https://platform.openai.com/overview
+OPENAI_API_KEY=
+
+# change this to an `accessToken` extracted from the ChatGPT site's `https://chat.openai.com/api/auth/session` response
+OPENAI_ACCESS_TOKEN=
 ```

 ## 安装依赖

 > 为了简便 `后端开发人员` 的了解负担，所以并没有采用前端 `workspace` 模式，而是分文件夹存放。如果只需要前端页面做二次开发，删除 `service` 文件夹即可。

-### 后端服务
+### 后端

 进入文件夹 `/service` 运行以下命令

@@ -55,14 +115,13 @@ OPENAI_API_KEY='Your key'
 pnpm install
 ```

-### 网页
+### 前端
 根目录下运行以下命令
 ```shell
 pnpm bootstrap
 ```

-
-## 运行
+## 测试环境运行
 ### 后端服务

 进入文件夹 `/service` 运行以下命令
@@ -71,22 +130,41 @@ pnpm bootstrap
 pnpm start
 ```

-### 网页
+### 前端网页
 根目录下运行以下命令
 ```shell
 pnpm dev
 ```

 ## 打包
-## Docker build

-[参考信息](https://github.com/Chanzhaoyu/chatgpt-web/pull/42)
+### 使用 Docker
+
+#### Docker 参数示例
+
+- `OPENAI_API_KEY` 二选一
+- `OPENAI_ACCESS_TOKEN`  二选一，同时存在时，`OPENAI_API_KEY` 优先
+- `API_REVERSE_PROXY` 可选，设置 `OPENAI_ACCESS_TOKEN` 时可用 [参考](#介绍)
+- `TIMEOUT_MS` 超时，单位毫秒，可选
+
+![docker](./docs/docker.png)
+
+#### Docker build & Run

 ```bash
 docker build -t chatgpt-web .
+
+# 前台运行
+docker run --name chatgpt-web --rm -it -p 3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web
+
+# 后台运行
+docker run --name chatgpt-web -d -p 3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web
+
+# 运行地址
+http://localhost:3002/
 ```

-## Docker compose
+#### Docker compose

 [Hub 地址](https://hub.docker.com/repository/docker/chenzhaoyu94/chatgpt-web/general)

@@ -99,13 +177,37 @@ services:
    ports:
      - 3002:3002
    environment:
+      # 二选一
      OPENAI_API_KEY: xxxxxx
+      # 二选一
+      OPENAI_ACCESS_TOKEN: xxxxxx
+      # 反向代理，可选
+      API_REVERSE_PROXY: xxx
+      # 超时，单位毫秒，可选
+      TIMEOUT_MS: 60000
 ```

-### 后端服务
+###  使用 Railway 部署
+
+[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/new/template/yytmgc)
+
+#### Railway 环境变量
+
+| 环境变量名称                | 必填 | 备注                    |
+| --------------------------- | ---- | ----------------------- |
+| `PORT` | 必填    | 默认 `3002`  |
+| `TIMEOUT_MS` | 可选    | 超时时间，单位毫秒，   |
+| `OPENAI_API_KEY` | `OpenAI API` 二选一    | 使用 `OpenAI API` 所需的 `apiKey` [(获取 apiKey)](https://platform.openai.com/overview)   |
+| `OPENAI_ACCESS_TOKEN` | `Web API` 二选一   | 使用 `Web API` 所需的 `accessToken` [(获取 accessToken)](https://chat.openai.com/api/auth/session)   |
+| `API_REVERSE_PROXY` | 可选，`Web API` 时可用    | `Web API` 反向代理地址 [详情](https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy)   |
+
+> 注意: `Railway` 修改环境变量会重新 `Deploy`
+
+### 手动打包
+#### 后端服务
 > 如果你不需要本项目的 `node` 接口，可以省略如下操作

-复制 `service` 文件夹到你有 `node` 服务环境的服务器上。（搜索关键字：`express部署`）
+复制 `service` 文件夹到你有 `node` 服务环境的服务器上。

 ```shell
 # 安装
@@ -120,9 +222,11 @@ pnpm prod

 PS: 不进行打包，直接在服务器上运行 `pnpm start` 也可

-### 前端打包
+#### 前端网页

-根目录下运行以下命令，然后将 `dist` 文件夹复制到你的托管服务器上
+1、修改根目录下 `.env` 内 `VITE_APP_API_BASE_URL` 为你的实际后端接口地址
+
+2、根目录下运行以下命令，然后将 `dist` 文件夹内的文件复制到你网站服务的根目录下

 [参考信息](https://cn.vitejs.dev/guide/static-deploy.html#building-the-app)

@@ -130,7 +234,7 @@ PS: 不进行打包，直接在服务器上运行 `pnpm start` 也可
 pnpm build
 ```

-### 常见问题
+## 常见问题
 Q: 为什么 `Git` 提交总是报错？

 A: 因为有提交信息验证，请遵循 [Commit 指南](./CONTRIBUTING.md)
--- a/config/index.ts
+++ b/config/index.ts
@@ -0,0 +1 @@
+export * from './proxy'
--- a/config/proxy.ts
+++ b/config/proxy.ts
@@ -0,0 +1,16 @@
+import type { ProxyOptions } from 'vite'
+
+export function createViteProxy(isOpenProxy: boolean, viteEnv: ImportMetaEnv) {
+  if (!isOpenProxy)
+    return
+
+  const proxy: Record<string, string | ProxyOptions> = {
+    '/api': {
+      target: viteEnv.VITE_GLOB_API_URL,
+      changeOrigin: true,
+      rewrite: path => path.replace(/^\/api/, ''),
+    },
+  }
+
+  return proxy
+}
--- a/docs/cover.png
+++ b/docs/cover.png
--- a/docs/cover2.png
+++ b/docs/cover2.png
--- a/docs/docker.png
+++ b/docs/docker.png
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "chatgpt-web",
-  "version": "2.5.1",
+  "version": "2.6.1",
  "private": false,
  "description": "ChatGPT Web",
  "author": "ChenZhaoYu <chenzhaoyu1994@gmail.com>",
@@ -25,6 +25,7 @@
  "dependencies": {
    "@vueuse/core": "^9.13.0",
    "highlight.js": "^11.7.0",
+    "marked": "^4.2.12",
    "naive-ui": "^2.34.3",
    "pinia": "^2.0.30",
    "vue": "^3.2.47",
@@ -36,6 +37,7 @@
    "@commitlint/config-conventional": "^17.4.4",
    "@iconify/vue": "^4.1.0",
    "@types/crypto-js": "^4.1.1",
+    "@types/marked": "^4.0.8",
    "@types/node": "^18.14.0",
    "@types/web-bluetooth": "^0.0.16",
    "@vitejs/plugin-vue": "^4.0.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,6 +6,7 @@ specifiers:
  '@commitlint/config-conventional': ^17.4.4
  '@iconify/vue': ^4.1.0
  '@types/crypto-js': ^4.1.1
+  '@types/marked': ^4.0.8
  '@types/node': ^18.14.0
  '@types/web-bluetooth': ^0.0.16
  '@vitejs/plugin-vue': ^4.0.0
@@ -18,6 +19,7 @@ specifiers:
  husky: ^8.0.3
  less: ^4.1.3
  lint-staged: ^13.1.2
+  marked: ^4.2.12
  naive-ui: ^2.34.3
  npm-run-all: ^4.1.5
  pinia: ^2.0.30
@@ -33,6 +35,7 @@ specifiers:
 dependencies:
  '@vueuse/core': 9.13.0_vue@3.2.47
  highlight.js: 11.7.0
+  marked: 4.2.12
  naive-ui: 2.34.3_vue@3.2.47
  pinia: 2.0.30_hmuptsblhheur2tugfgucj7gc4
  vue: 3.2.47
@@ -44,6 +47,7 @@ devDependencies:
  '@commitlint/config-conventional': 17.4.4
  '@iconify/vue': 4.1.0_vue@3.2.47
  '@types/crypto-js': 4.1.1
+  '@types/marked': 4.0.8
  '@types/node': 18.14.0
  '@types/web-bluetooth': 0.0.16
  '@vitejs/plugin-vue': 4.0.0_vite@4.1.2+vue@3.2.47
@@ -735,6 +739,10 @@ packages:
    resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==}
    dev: false

+  /@types/marked/4.0.8:
+    resolution: {integrity: sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==}
+    dev: true
+
  /@types/mdast/3.0.10:
    resolution: {integrity: sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==}
    dependencies:
@@ -3229,6 +3237,12 @@ packages:
    engines: {node: '>=8'}
    dev: true

+  /marked/4.2.12:
+    resolution: {integrity: sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==}
+    engines: {node: '>= 12'}
+    hasBin: true
+    dev: false
+
  /mdast-util-from-markdown/0.8.5:
    resolution: {integrity: sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==}
    dependencies:
--- a/service/.env
+++ b/service/.env
@@ -1,2 +1,11 @@
 # OpenAI API Key - https://platform.openai.com/overview
 OPENAI_API_KEY=
+
+# change this to an `accessToken` extracted from the ChatGPT site's `https://chat.openai.com/api/auth/session` response
+OPENAI_ACCESS_TOKEN=
+
+# Reverse Proxy
+API_REVERSE_PROXY=
+
+# timeout
+TIMEOUT_MS=60000
--- a/service/package.json
+++ b/service/package.json
@@ -23,7 +23,7 @@
    "common:cleanup": "rimraf node_modules && rimraf pnpm-lock.yaml"
  },
  "dependencies": {
-    "chatgpt": "^4.7.1",
+    "chatgpt": "^4.7.2",
    "dotenv": "^16.0.3",
    "esno": "^0.16.3",
    "express": "^4.18.2",
--- a/service/pnpm-lock.yaml
+++ b/service/pnpm-lock.yaml
@@ -4,7 +4,7 @@ specifiers:
  '@antfu/eslint-config': ^0.35.2
  '@types/express': ^4.17.17
  '@types/node': ^18.14.0
-  chatgpt: ^4.7.1
+  chatgpt: ^4.7.2
  dotenv: ^16.0.3
  eslint: ^8.34.0
  esno: ^0.16.3
@@ -15,7 +15,7 @@ specifiers:
  typescript: ^4.9.5

 dependencies:
-  chatgpt: 4.7.1
+  chatgpt: 4.7.2
  dotenv: 16.0.3
  esno: 0.16.3
  express: 4.18.2
@@ -878,8 +878,8 @@ packages:
    resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==}
    dev: true

-  /chatgpt/4.7.1:
-    resolution: {integrity: sha512-FRXfpjn//Y4gUMcUo60W5byJ0CbFhC1Xp3PCm2qcBthBYFbC+LyRrwxvSVTdNwgQywHV4Pc5SFkaZ72f5rCNdQ==}
+  /chatgpt/4.7.2:
+    resolution: {integrity: sha512-c5CNqvB98IMEz/Byopwu5FlXGS3w/3iNiZITdDlcZLue4VSjEfzMRWrOrdGidzcE+ud2My6nO8/sSnY7W04WJA==}
    engines: {node: '>=14'}
    hasBin: true
    dependencies:
--- a/service/src/chatgpt.ts
+++ b/service/src/chatgpt.ts
@@ -1,27 +1,46 @@
 import * as dotenv from 'dotenv'
 import 'isomorphic-fetch'
 import type { ChatGPTAPI, SendMessageOptions } from 'chatgpt'
+import { ChatGPTUnofficialProxyAPI } from 'chatgpt'
 import { sendResponse } from './utils'

+dotenv.config()
+
+let apiModel: 'ChatGPTAPI' | 'ChatGPTUnofficialProxyAPI' | undefined
+
 export interface ChatContext {
  conversationId?: string
  parentMessageId?: string
 }

-dotenv.config()
+const timeoutMs: number = !isNaN(+process.env.TIMEOUT_MS) ? +process.env.TIMEOUT_MS : 30 * 1000

-const apiKey = process.env.OPENAI_API_KEY
+if (!process.env.OPENAI_API_KEY && !process.env.OPENAI_ACCESS_TOKEN)
+  throw new Error('Missing OPENAI_API_KEY or OPENAI_ACCESS_TOKEN environment variable')

-if (apiKey === undefined)
-  throw new Error('OPENAI_API_KEY is not defined')
-
-let api: ChatGPTAPI
+let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI

 // To use ESM in CommonJS, you can use a dynamic import
 (async () => {
  // More Info: https://github.com/transitive-bullshit/chatgpt-api
  const { ChatGPTAPI } = await import('chatgpt')
-  api = new ChatGPTAPI({ apiKey: process.env.OPENAI_API_KEY })
+
+  if (process.env.OPENAI_API_KEY) {
+    api = new ChatGPTAPI({ apiKey: process.env.OPENAI_API_KEY })
+    apiModel = 'ChatGPTAPI'
+  }
+  else {
+    let options = {}
+
+    if (process.env.API_REVERSE_PROXY)
+      options = { apiReverseProxyUrl: process.env.API_REVERSE_PROXY }
+
+    api = new ChatGPTUnofficialProxyAPI({
+      accessToken: process.env.OPENAI_ACCESS_TOKEN,
+      ...options,
+    })
+    apiModel = 'ChatGPTUnofficialProxyAPI'
+  }
 })()

 async function chatReply(
@@ -32,7 +51,7 @@ async function chatReply(
    return sendResponse({ type: 'Fail', message: 'Message is empty' })

  try {
-    let options: SendMessageOptions = { timeoutMs: 30 * 1000 }
+    let options: SendMessageOptions = { timeoutMs }

    if (lastContext)
      options = { ...lastContext }
@@ -46,4 +65,15 @@ async function chatReply(
  }
 }

-export { chatReply }
+async function chatConfig() {
+  return sendResponse({
+    type: 'Success',
+    data: {
+      apiModel,
+      reverseProxy: process.env.API_REVERSE_PROXY,
+      timeoutMs,
+    },
+  })
+}
+
+export { chatReply, chatConfig }
--- a/service/src/index.ts
+++ b/service/src/index.ts
@@ -1,6 +1,6 @@
 import express from 'express'
 import type { ChatContext } from './chatgpt'
-import { chatReply } from './chatgpt'
+import { chatConfig, chatReply } from './chatgpt'

 const app = express()
 const router = express.Router()
@@ -26,6 +26,16 @@ router.post('/chat', async (req, res) => {
  }
 })

+router.post('/config', async (req, res) => {
+  try {
+    const response = await chatConfig()
+    res.send(response)
+  }
+  catch (error) {
+    res.send(error)
+  }
+})
+
 app.use('', router)
 app.use('/api', router)

--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -12,3 +12,9 @@ export function fetchChatAPI<T = any>(
    signal,
  })
 }
+
+export function fetchChatConfig<T = any>() {
+  return post<T>({
+    url: '/config',
+  })
+}
--- a/src/components/common/Setting/index.vue
+++ b/src/components/common/Setting/index.vue
@@ -0,0 +1,67 @@
+<script setup lang='ts'>
+import { computed, ref, watch } from 'vue'
+import { NCard, NModal } from 'naive-ui'
+import { fetchChatConfig } from '@/api'
+
+interface Props {
+  visible: boolean
+}
+
+interface Emit {
+  (e: 'update:visible', visible: boolean): void
+}
+
+interface ConfigState {
+  timeoutMs?: number
+  reverseProxy?: string
+  apiModel?: string
+}
+
+const props = defineProps<Props>()
+
+const emit = defineEmits<Emit>()
+
+const show = computed({
+  get() {
+    return props.visible
+  },
+  set(visible: boolean) {
+    emit('update:visible', visible)
+  },
+})
+
+const config = ref<ConfigState>()
+
+async function fetchConfig() {
+  try {
+    const { data } = await fetchChatConfig<ConfigState>()
+    config.value = data
+  }
+  catch (error) {
+    // ...
+  }
+}
+
+watch(
+  () => props.visible,
+  (val) => {
+    if (val)
+      fetchConfig()
+  },
+)
+</script>
+
+<template>
+  <NModal v-model:show="show" style="width: 80%; max-width: 460px;">
+    <NCard>
+      <div class="space-y-4">
+        <h1 class="text-xl font-bold">
+          当前后台设置
+        </h1>
+        <p>API方式：{{ config?.apiModel ?? '-' }}</p>
+        <p>反向代理：{{ config?.reverseProxy ?? '-' }}</p>
+        <p>超时时间：{{ config?.timeoutMs ?? '-' }}</p>
+      </div>
+    </NCard>
+  </NModal>
+</template>
--- a/src/components/common/index.ts
+++ b/src/components/common/index.ts
@@ -2,5 +2,6 @@ import HoverButton from './HoverButton/index.vue'
 import NaiveProvider from './NaiveProvider/index.vue'
 import SvgIcon from './SvgIcon/index.vue'
 import UserAvatar from './UserAvatar/index.vue'
+import Setting from './Setting/index.vue'

-export { HoverButton, NaiveProvider, SvgIcon, UserAvatar }
+export { HoverButton, NaiveProvider, SvgIcon, UserAvatar, Setting }
--- a/src/directives/highlight.ts
+++ b/src/directives/highlight.ts
@@ -1,9 +1,9 @@
 import type { App, Directive } from 'vue'
 import hljs from 'highlight.js'
+import includeCode from '@/utils/functions/includeCode'

 function highlightCode(el: HTMLElement) {
-  const regexp = /^(?:\s{4}|\t).+/gm
-  if (el.textContent?.indexOf(' = ') !== -1 || el.textContent.match(regexp))
+  if (includeCode(el.textContent))
    hljs.highlightBlock(el)
 }

--- a/src/typings/env.d.ts
+++ b/src/typings/env.d.ts
@@ -2,5 +2,6 @@

 interface ImportMetaEnv {
 	readonly VITE_GLOB_API_URL: string;
-	readonly VITE_APP_API_BASE_URL: string;
+	readonly VITE_GLOB_API_TIMEOUT: string;
+	readonly VITE_GLOB_HTTP_PROXY: 'Y' | 'N';
 }
--- a/src/utils/functions/includeCode.ts
+++ b/src/utils/functions/includeCode.ts
@@ -0,0 +1,6 @@
+function includeCode(text: string | null | undefined) {
+  const regexp = /^(?:\s{4}|\t).+/gm
+  return !!(text?.includes(' = ') || text?.match(regexp))
+}
+
+export default includeCode
--- a/src/utils/request/axios.ts
+++ b/src/utils/request/axios.ts
@@ -1,8 +1,8 @@
 import axios, { type AxiosResponse } from 'axios'

 const service = axios.create({
-  baseURL: import.meta.env.VITE_GLOB_API_URL,
-  timeout: 30 * 1000,
+  baseURL: import.meta.env.VITE_GLOB_HTTP_PROXY === 'Y' ? '/api' : import.meta.env.VITE_GLOB_API_URL,
+  timeout: !isNaN(+import.meta.env.VITE_GLOB_API_TIMEOUT) ? Number(import.meta.env.VITE_GLOB_API_TIMEOUT) : 60 * 1000,
 })

 service.interceptors.request.use(
--- a/src/views/chat/components/Message/Text.vue
+++ b/src/views/chat/components/Message/Text.vue
@@ -1,28 +1,60 @@
 <script lang="ts" setup>
+import { computed } from 'vue'
+import { marked } from 'marked'
+import includeCode from '@/utils/functions/includeCode'
+
 interface Props {
  inversion?: boolean
  error?: boolean
+  text?: string
+  loading?: boolean
 }

-defineProps<Props>()
+const props = defineProps<Props>()
+
+const wrapClass = computed(() => {
+  return [
+    'text-wrap',
+    'p-2',
+    'min-w-[20px]',
+    'rounded-md',
+    props.inversion ? 'bg-[#d2f9d1]' : 'bg-[#f4f6f8]',
+    { 'text-red-500': props.error },
+  ]
+})
+
+const text = computed(() => {
+  if (props.text) {
+    if (!includeCode(props.text))
+      return marked.parse(props.text)
+    return props.text
+  }
+  return ''
+})
 </script>

 <template>
-  <div
-    class="min-w-[20px] p-2 rounded-md"
-    :class="[inversion ? 'bg-[#d2f9d1]' : 'bg-[#f4f6f8]', { 'text-red-500': error }]"
-  >
-    <span
-      v-highlight
-      class="leading-relaxed whitespace-pre-wrap"
-    >
-      <slot />
-    </span>
+  <div :class="wrapClass">
+    <template v-if="loading">
+      <span class="w-[3px] h-[20px] block animate-blink" />
+    </template>
+    <template v-else>
+      <code v-if="includeCode(text)" v-highlight class="leading-relaxed" v-text="text" />
+      <div v-else class="leading-relaxed break-all" v-html="text" />
+    </template>
  </div>
 </template>

-<style>
+<style lang="less">
+.text-wrap{
+  img{
+    max-width: 100%;
+    vertical-align: middle;
+  }
+}
+
 .hljs {
  background-color: #fff0 !important;
+  white-space: break-spaces;
 }
 </style>
--- a/src/views/chat/components/Message/index.vue
+++ b/src/views/chat/components/Message/index.vue
@@ -37,10 +37,7 @@ function handleRegenerate() {
        {{ dateTime }}
      </span>
      <div class="flex items-end mt-2">
-        <Text :inversion="inversion" :error="error">
-          <span v-if="loading" class="w-[3px] h-[20px] block animate-blink" />
-          <span v-else>{{ text }}</span>
-        </Text>
+        <Text :inversion="inversion" :error="error" :text="text" :loading="loading" />
        <button
          v-if="!inversion && !loading"
          class="mb-2 ml-2 transition text-neutral-400 hover:text-neutral-800"
--- a/src/views/chat/index.vue
+++ b/src/views/chat/index.vue
@@ -153,7 +153,6 @@ async function onRegenerate(index: number) {
      requestOptions: { prompt: message, ...options },
    },
  )
-  scrollToBottom()

  try {
    const { data } = await fetchChatAPI<Chat.ConversationResponse>(message, options, controller.signal)
@@ -170,7 +169,6 @@ async function onRegenerate(index: number) {
        requestOptions: { prompt: message, ...options },
      },
    )
-    scrollToBottom()
  }
  catch (error: any) {
    let errorMessage = 'Something went wrong, please try again later.'
@@ -191,7 +189,6 @@ async function onRegenerate(index: number) {
        requestOptions: { prompt: message, ...options },
      },
    )
-    scrollToBottom()
  }
  finally {
    loading.value = false
@@ -224,6 +221,13 @@ const buttonDisabled = computed(() => {
  return loading.value || !prompt.value || prompt.value.trim() === ''
 })

+const wrapClass = computed(() => {
+  if (isMobile.value)
+    return ['pt-14', 'pb-14']
+
+  return []
+})
+
 const footerClass = computed(() => {
  let classes = ['p-4']
  if (isMobile.value)
@@ -242,7 +246,7 @@ onUnmounted(() => {
 </script>

 <template>
-  <div class="flex flex-col h-full pt-14 pb-14">
+  <div class="flex flex-col h-full" :class="wrapClass">
    <main class="flex-1 overflow-hidden">
      <div ref="scrollRef" class="h-full p-4 overflow-hidden overflow-y-auto" :class="[{ 'p-2': isMobile }]">
        <template v-if="!dataSources.length">
--- a/src/views/chat/layout/sider/Footer.vue
+++ b/src/views/chat/layout/sider/Footer.vue
@@ -0,0 +1,19 @@
+<script setup lang='ts'>
+import { ref } from 'vue'
+import { HoverButton, Setting, SvgIcon, UserAvatar } from '@/components/common'
+
+const show = ref(false)
+</script>
+
+<template>
+  <footer class="flex items-center justify-between min-w-0 p-4 overflow-hidden border-t">
+    <UserAvatar />
+    <HoverButton tooltip="Setting" @click="show = true">
+      <span class="text-xl text-[#4f555e]">
+        <SvgIcon icon="ri:settings-4-line" />
+      </span>
+    </HoverButton>
+
+    <Setting v-model:visible="show" />
+  </footer>
+</template>
--- a/src/views/chat/layout/sider/index.vue
+++ b/src/views/chat/layout/sider/index.vue
@@ -3,7 +3,7 @@ import type { CSSProperties } from 'vue'
 import { computed, watch } from 'vue'
 import { NButton, NLayoutSider } from 'naive-ui'
 import List from './List.vue'
-import { HoverButton, SvgIcon, UserAvatar } from '@/components/common'
+import Footer from './Footer.vue'
 import { useAppStore, useChatStore } from '@/store'
 import { useBasicLayout } from '@/hooks/useBasicLayout'

@@ -67,14 +67,7 @@ watch(
          <List />
        </div>
      </main>
-      <footer class="flex items-center justify-between min-w-0 p-4 overflow-hidden border-t">
-        <UserAvatar />
-        <HoverButton tooltip="Setting">
-          <span class="text-xl text-[#4f555e]">
-            <SvgIcon icon="ri:settings-4-line" />
-          </span>
-        </HoverButton>
-      </footer>
+      <Footer />
    </div>
  </NLayoutSider>
  <template v-if="isMobile">
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,10 +1,13 @@
 import path from 'path'
 import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
+import { createViteProxy } from './config'

 export default defineConfig((env) => {
  const viteEnv = loadEnv(env.mode, process.cwd()) as unknown as ImportMetaEnv

+  const isOpenProxy = viteEnv.VITE_GLOB_HTTP_PROXY === 'Y'
+
  return {
    resolve: {
      alias: {
@@ -13,16 +16,10 @@ export default defineConfig((env) => {
    },
    plugins: [vue()],
    server: {
-      port: 1002,
      host: '0.0.0.0',
+      port: 1002,
      open: false,
-      proxy: {
-        '/api': {
-          target: viteEnv.VITE_APP_API_BASE_URL,
-          changeOrigin: true, // 允许跨域
-          rewrite: path => path.replace('/api/', '/'),
-        },
-      },
+      proxy: createViteProxy(isOpenProxy, viteEnv),
    },
    build: {
      reportCompressedSize: false,
Author	SHA1	Message	Date
ChenZhaoYu	c0f8e4316e	chore: version 2.6.1	2023-02-22 14:43:55 +08:00
Redon	bf5c0cdf04	fix: 手动打包 Proxy 问题(#91 ) * perf: 检查代码 * feat: proxy setting * chore: 调整为测试环境使用 `proxy`	2023-02-22 14:29:05 +08:00
Redon	66cecb6049	Update README.md	2023-02-22 10:40:26 +08:00
闫冰	808ae600c2	chore: 新增 Railway 部署模版！ (#85 ) * 新增使用 Railway 免费一键部署模版！ * 修改描述 * 修改模版的必填项以及新增超时时间参数 * 移除推广code * Update README.md --------- Co-authored-by: Redon <790348264@qq.com>	2023-02-22 10:36:11 +08:00
Redon	f40048fb08	feat: 支持 accessToken 请求 web api 调用 (#80 ) * feat: 支持 markdown 格式和图片 * perf: 重载的时候滚动条保持 * chore: version 2.5.2 * feat: 添加文字换行 * chore: 添加新封面 * chore: 更新 cover * feat: 支持 web api 的形式 * feat: 支持新模型和调整超时 * feat: 添加反向代理 * chore: 更新 README.md * feat: 添加超时和反向代理显示 * chore: version 2.6.0 * chore: update README	2023-02-21 15:26:23 +08:00
Redon	ac9536ab87	feat: 支持 markdown 格式 (#77 ) * feat: 支持 markdown 格式和图片 * perf: 重载的时候滚动条保持 * chore: version 2.5.2 * feat: 添加文字换行 * chore: 添加新封面 * chore: 更新 cover	2023-02-21 11:57:29 +08:00
Redon	938c91f635	fix: 样式异常 (#76 ) * chore: update README * fix: 样式异常	2023-02-21 09:32:09 +08:00