v1.0.3

xyhelper · Mar 31, 2023 · 08c9798 · 08c9798
1 parent 61db812
commit 08c9798
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 29 deletions.
diff --git a/app.go b/app.go
@@ -170,3 +170,22 @@ func (a *App) ChatProcess(req *ChatProcessReq) {
 func (a *App) StopChat() {
 	g.Log().Info(a.ctx, "StopChat~~~~~~~~~~~~~~~~~~~~")
 }
+
+// RefreshBind
+func (a *App) RefreshBind(baseURI string, accessToken string) (result string) {
+	g.Log().Info(a.ctx, "RefreshToken~~~~~~~~~~~~~~~~~~~~", baseURI, accessToken)
+	res, err := g.Client().ContentJson().Post(a.ctx, baseURI+"/backend-api/xy/refresh-bind", g.Map{
+		"token": accessToken,
+	})
+	if err != nil {
+		g.Log().Error(a.ctx, "RefreshToken", err)
+		return "fail"
+	}
+	defer res.Close()
+	if res.StatusCode != 200 {
+		g.Log().Error(a.ctx, "RefreshToken", res.ReadAllString())
+		return "fail"
+	}
+
+	return "success"
+}
diff --git a/frontend/public/defaultavatar.jpeg b/frontend/public/defaultavatar.jpeg
diff --git a/frontend/src/components/common/Setting/General.vue b/frontend/src/components/common/Setting/General.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
 import { NButton, NInput, NPopconfirm, NSelect, useMessage } from 'naive-ui'
+import { RefreshBind } from '../../../../wailsjs/go/main/App'
 import type { Language, Theme } from '@/store/modules/app/helper'
 import { SvgIcon } from '@/components/common'
 import { useAppStore, useUserStore } from '@/store'
@@ -122,6 +123,16 @@ function handleImportButtonClick(): void {
   if (fileInput)
     fileInput.click()
 }
+
+function handleRefreshBind(baseURI: string, accessToken: string) {
+  RefreshBind(baseURI, accessToken).then((res) => {
+    if (res === 'success')
+      ms.success(t('common.success'))
+
+    else
+      ms.error(t('common.failed'))
+  })
+}
 </script>
 
 <template>
@@ -135,6 +146,9 @@ function handleImportButtonClick(): void {
         <NButton size="tiny" text type="primary" @click="updateUserInfo({ baseURI })">
           {{ $t('common.save') }}
         </NButton>
+        <NButton size="tiny" text type="warning" @click="handleRefreshBind(baseURI, accessToken)">
+          {{ $t('common.refreshBinding') }}
+        </NButton>
       </div>
       <div class="flex items-center space-x-4">
         <span class="flex-shrink-0 w-[100px]">AccessToken</span>
@@ -146,20 +160,20 @@ function handleImportButtonClick(): void {
         </NButton>
       </div>
       <!-- <div
-        class="flex items-center space-x-4"
-        :class="isMobile && 'items-start'"
-      >
-        <span class="flex-shrink-0 w-[100px]">{{ $t('setting.serverConfig') }}</span>
+          class="flex items-center space-x-4"
+          :class="isMobile && 'items-start'"
+        >
+          <span class="flex-shrink-0 w-[100px]">{{ $t('setting.serverConfig') }}</span>
 
-        <div class="flex flex-wrap items-center gap-4">
-          <NButton size="small" @click="exportData">
-            <template #icon>
-              <SvgIcon icon="ri:refresh-line" />
-            </template>
-            {{ $t('common.refreshBinding') }}
-          </NButton>
-        </div>
-      </div> -->
+          <div class="flex flex-wrap items-center gap-4">
+            <NButton size="small" @click="exportData">
+              <template #icon>
+                <SvgIcon icon="ri:refresh-line" />
+              </template>
+              {{ $t('common.refreshBinding') }}
+            </NButton>
+          </div>
+        </div> -->
       <div class="flex items-center space-x-4">
         <span class="flex-shrink-0 w-[100px]">{{ $t('setting.avatarLink') }}</span>
         <div class="flex-1">
@@ -188,10 +202,7 @@ function handleImportButtonClick(): void {
         </NButton>
       </div>
 
-      <div
-        class="flex items-center space-x-4"
-        :class="isMobile && 'items-start'"
-      >
+      <div class="flex items-center space-x-4" :class="isMobile && 'items-start'">
         <span class="flex-shrink-0 w-[100px]">{{ $t('setting.chatHistory') }}</span>
 
         <div class="flex flex-wrap items-center gap-4">
@@ -227,11 +238,7 @@ function handleImportButtonClick(): void {
         <span class="flex-shrink-0 w-[100px]">{{ $t('setting.theme') }}</span>
         <div class="flex flex-wrap items-center gap-4">
           <template v-for="item of themeOptions" :key="item.key">
-            <NButton
-              size="small"
-              :type="item.key === theme ? 'primary' : undefined"
-              @click="appStore.setTheme(item.key)"
-            >
+            <NButton size="small" :type="item.key === theme ? 'primary' : undefined" @click="appStore.setTheme(item.key)">
               <template #icon>
                 <SvgIcon :icon="item.icon" />
               </template>
@@ -243,9 +250,7 @@ function handleImportButtonClick(): void {
         <span class="flex-shrink-0 w-[100px]">{{ $t('setting.language') }}</span>
         <div class="flex flex-wrap items-center gap-4">
           <NSelect
-            style="width: 140px"
-            :value="language"
-            :options="languageOptions"
+            style="width: 140px" :value="language" :options="languageOptions"
             @update-value="value => appStore.setLanguage(value)"
           />
         </div>

diff --git a/frontend/src/locales/en-US.ts b/frontend/src/locales/en-US.ts
@@ -68,6 +68,7 @@ export default {
     httpsProxy: 'HTTPS Proxy',
     balance: 'API Balance',
     serverConfig: 'Server Config',
+    confirmRefreshBind: 'Are you sure to refresh the binding?',
   },
   store: {
     local: 'Local',

diff --git a/frontend/src/locales/zh-CN.ts b/frontend/src/locales/zh-CN.ts
@@ -70,6 +70,7 @@ export default {
     httpsProxy: 'HTTPS Proxy',
     balance: 'API余额',
     serverConfig: '服务器配置',
+    confirmRefreshBind: '是否刷新绑定?',
   },
   store: {
     local: '本地',

diff --git a/frontend/src/locales/zh-TW.ts b/frontend/src/locales/zh-TW.ts
@@ -68,6 +68,7 @@ export default {
     httpsProxy: 'HTTPS Proxy',
     balance: 'API余額',
     serverConfig: '伺服器設定',
+    confirmRefreshBind: '是否重新綁定？',
   },
   store: {
     local: '本機',

diff --git a/frontend/src/store/modules/user/helper.ts b/frontend/src/store/modules/user/helper.ts
@@ -32,7 +32,7 @@ export function defaultSetting(): UserState {
 
   return {
     userInfo: {
-      avatar: 'https://xyhelper.cn/defaultavatar.jpeg',
+      avatar: '/defaultavatar.jpeg',
       name: '攻城狮老李',
       description: '官网: https://xyhelper.cn',
       baseURI: 'https://freechat.lidong.xin',

diff --git a/frontend/src/views/chat/index.vue b/frontend/src/views/chat/index.vue
@@ -145,7 +145,7 @@ async function onConversation() {
     accessToken: userInfo.value.accessToken,
     isGPT4: State.isGPT4,
 
-  }).then((data: any) => {
+  }).then(() => {
     EventsOff(chatChannel)
     loading.value = false
   })
@@ -376,7 +376,7 @@ function ChangeModel() {
     ms.success('已关闭gpt4模型')
 
   else
-    ms.success('已开启gpt4模型')
+    ms.success('已开启gpt4模型,仅PLUS用户开启有效')
 }
 
 // 可优化部分
@@ -488,7 +488,7 @@ onUnmounted(() => {
               <SvgIcon icon="ri:chat-history-line" />
             </span>
           </HoverButton>
-          <NSwitch v-model:value="State.isGPT4" class="w-[160px]" @update:value="$enent => ChangeModel(`gpt4`)">
+          <NSwitch v-model:value="State.isGPT4" class="w-[160px]" @update:value="$enent => ChangeModel()">
             <template #checked>
               gpt4
             </template>

diff --git a/frontend/wailsjs/go/main/App.d.ts b/frontend/wailsjs/go/main/App.d.ts
@@ -5,6 +5,8 @@ export function ChatProcess(arg1:any):Promise<void>;
 
 export function Greet(arg1:string):Promise<string>;
 
+export function RefreshBind(arg1:string,arg2:string):Promise<string>;
+
 export function Session():Promise<any>;
 
 export function StopChat():Promise<void>;
diff --git a/frontend/wailsjs/go/main/App.js b/frontend/wailsjs/go/main/App.js
@@ -10,6 +10,10 @@ export function Greet(arg1) {
   return window['go']['main']['App']['Greet'](arg1);
 }
 
+export function RefreshBind(arg1, arg2) {
+  return window['go']['main']['App']['RefreshBind'](arg1, arg2);
+}
+
 export function Session() {
   return window['go']['main']['App']['Session']();
 }