Compare commits

..

No commits in common. "main" and "dev" have entirely different histories.
main ... dev

3 changed files with 39 additions and 52 deletions

View File

@ -79,15 +79,3 @@
- web平台 `pnpm build:h5`,打包后的文件在 `dist/build/h5`可以放到web服务器如nginx运行。如果最终不是放在根目录可以在 `manifest.config.ts` 文件的 `h5.router.base` 属性进行修改。
- weixin平台`pnpm build:mp-weixin`, 打包后的文件在 `dist/build/mp-weixin`,然后通过微信开发者工具导入,并点击右上角的“上传”按钮进行上传。
- APP平台`pnpm build:app`, 然后打开 `HBuilderX`,导入刚刚生成的`dist/build/app` 文件夹,选择发行 - APP云打包。
主要代码路径AIchat\src\pages\index\index.vue
其他文件删除时需要注意是否被AIchat\src\pages\index\index.vue引用
# 发版 只看这里
- 现在只用ob
- 发正式 pnpm build:h5执行后打包 AIchat\dist\build\h5压缩文件名 obAiChat-xiaomo.zip注意 env/.env.production下请求地址
- 上传至 <http://114.218.158.24:8044/files/prod/front/AIchat/> 然后构建 【线上】前端 front-obaichat-xiaomo
- 查看<https://xiaomo.fiee.com> 是否更新
- 请求地址为 <https://oa-b.szjixun.cn/api>
- 此项目提交commit有规则通用为 fix: xxx

1
env/.env vendored
View File

@ -8,7 +8,6 @@ VITE_DEV_TOKEN= ""
VITE_APP_PUBLIC_BASE=/
VITE_SERVER_BASEURL = 'http://114.218.158.24:9020'
# VITE_SERVER_BASEURL = 'https://oa-b.szjixun.cn/api'
VITE_UPLOAD_BASEURL = 'http://114.218.158.24:9020'
# 有些同学可能需要在微信小程序里面根据 develop、trial、release 分别设置上传地址,参考代码如下。

View File

@ -11,8 +11,7 @@
<div class="flex flex-col h-screen bg-#ffffff tops">
<!-- Navigation Bar -->
<div
class="flex-none flex items-center justify-between px-5 pb-2 bg-white shadow-md pt-2 z-999 fixed w-full box-border"
:style="{ top: statusBarHeight + 'px' }"
class="flex-none flex items-center justify-between px-5 pb-6 bg-white shadow-md h-20 pt-15 z-999 fixed top-0 w-full box-border"
>
<image src="/static/aichat/black.png" class="w-3 h-4.5" @click="goBack" />
<div class="text-lg font-medium ml-12">小墨</div>
@ -22,6 +21,7 @@
<image src="/static/aichat/new.png" class="w-5 h-5" @click="newChat" />
</div>
</div>
<!-- 消息区 -->
<div
:class="[
@ -514,6 +514,7 @@ import {
import 'dayjs/locale/zh-cn'
import { showToastErr, showToastOk, time_format3 } from '@/utils/tools'
import { uploadFileChunk } from './utils/api.js'
// import { TOKEN, AVATAR } from './utils/test'
import { deepClone } from 'wot-design-uni/components/common/util'
import VConsole from 'vconsole'
@ -626,16 +627,11 @@ async function createChatSession() {
gptModel: chatMode.value,
},
header: {
Authorization: chatToken.value,
Authorization: token.value,
},
})
// listUuid
if (res.data.status === 401) {
const { token: newToken } = await window.NativeBridge.call('auth.refreshToken')
chatToken.value = newToken
createChatSession()
return
}
if (res.data.code === 0 && res?.data?.data?.listUuid) {
listUuid.value = res?.data?.data?.listUuid
} else {
@ -673,14 +669,10 @@ async function fetchHistoryList() {
page: state.page,
pageSize: state.pageSize,
},
header: {},
header: {
// Authorization: token.value,
},
})
if (resp.data.status === 401) {
const { token: newToken } = await window.NativeBridge.call('auth.refreshToken')
chatToken.value = newToken
fetchHistoryList()
return
}
if (resp.data.code == 0 && resp.data.data) {
if (rawList.value.length > 0) {
rawList.value = rawList.value.concat(resp.data.data.data)
@ -739,14 +731,10 @@ async function fetchHistoryDiets(value) {
listUuid: value,
gptModel: chatMode.value,
},
header: {},
header: {
// Authorization: token.value,
},
})
if (resp.data.status === 401) {
const { token: newToken } = await window.NativeBridge.call('auth.refreshToken')
chatToken.value = newToken
fetchHistoryDiets(value)
return
}
if (resp.data.status === 0 && resp.data && resp.data.data) {
const rawList = resp?.data?.data?.detail //
listUuid.value = resp?.data?.data?.listUuid
@ -1016,31 +1004,35 @@ function tryParseMapFormat(str: string): ParsedPart[] | null {
return result.length > 0 ? result : null
}
const chatToken = ref<string>()
const chatUserInfo = ref<any>({})
let statusBarHeight = ref<number>(0)
const token = ref<string>()
const userInfo = ref<any>({})
const refreshToken = ref<string>('')
const statusBarHeight = ref<number>(0)
const mask = ref('')
// ---- ----
onMounted(async () => {
const info = await window?.NativeBridge?.call('device.getInfo')
if (info) statusBarHeight.value += info.safeAreaInsets.top
const { token } = await window.NativeBridge.getAccessToken()
const { user } = await window.NativeBridge.call('auth.getUser')
chatToken.value = token
chatUserInfo.value = user
// 1. init Extras
try {
const init = async () => {
const wv = plus.webview.currentWebview() // Webview
userAvatar.value = chatUserInfo.value.Avatar
mask.value = chatUserInfo.value.ID
token.value =
wv.token ||
uni.getStorageSync('token') ||
store.userInfo.token ||
import.meta.env.VITE_DEV_TOKEN
userInfo.value = JSON.parse(wv.userInfo) || {}
refreshToken.value = wv.refreshToken || uni.getStorageSync('refreshToken')
statusBarHeight.value = wv.statusBarHeight || uni.getSystemInfoSync().statusBarHeight
userAvatar.value = userInfo.value.Avatar
mask.value = userInfo.value.ID
store.setUserInfo({
token: chatToken.value,
avatar: chatUserInfo.value.Avatar,
token: token.value,
avatar: userInfo.value.Avatar,
refreshToken: refreshToken.value,
statusBarHeight: statusBarHeight.value,
})
if (chatUserInfo.value.TelNum === '18639432358') {
if (userInfo.value.TelNum === '18639432358') {
new VConsole()
}
await createChatSession()
@ -1049,7 +1041,12 @@ onMounted(async () => {
} catch (e) {
console.error('onMounted e: ', e)
} finally {
// store.userInfo.token = ''
// token.value = store.userInfo.token
}
// if (JSON.parse(uni.getStorageSync('userInfo'))?.NickName === '') {
// new VConsole()
// }
})
function scrollToBottom() {
@ -1911,11 +1908,12 @@ const send = async (body) => {
method: 'POST',
headers: {
'Content-Type': 'application/json',
Authorization: chatToken.value,
Authorization: token.value,
},
body: JSON.stringify(body),
signal: signal,
})
// console.log(resp)
const reader = resp.body!.getReader()
const decoder = new TextDecoder()
@ -1924,6 +1922,8 @@ const send = async (body) => {
while (!done) {
if (stopStreamMsg) {
//
// reader.cancel();
controller.abort()
stopStreamMsg = false
}