From fa165d4e0c0f456be7f910f1758f588662c102dc Mon Sep 17 00:00:00 2001
From: Fripine <Fripine@hotmail.com>
Date: Thu, 7 Nov 2024 19:04:40 +0800
Subject: [PATCH 1/6] feat: postAddLagrangeGocq

---
 src/api/im_connections/index.ts         | 18 +++++++++++-
 src/components/PageConnectInfoItems.vue | 37 ++++++++++++++++---------
 src/store/index.ts                      | 12 +++++++-
 3 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/src/api/im_connections/index.ts b/src/api/im_connections/index.ts
index bc28d66..3e37d80 100644
--- a/src/api/im_connections/index.ts
+++ b/src/api/im_connections/index.ts
@@ -180,6 +180,22 @@ export function postAddLagrange(account: string, signServerUrl: string, signServ
   );
 }
 
+export function postAddLagrangeGocq(
+  account: string,
+  signServerUrl: string,
+  signServerVersion: string,
+) {
+  return request<DiceConnection>(
+    'post',
+    'addLagrangeGocq',
+    { account, signServerUrl, signServerVersion },
+    'json',
+    {
+      timeout: 65000,
+    },
+  );
+}
+
 export function postConnectionDel(id: string) {
   return request<DiceConnection>('post', 'del', { id });
 }
@@ -364,4 +380,4 @@ type ServerConfig = {
   url: string;
   key: string;
   authorization: string;
-};
+};
\ No newline at end of file
diff --git a/src/components/PageConnectInfoItems.vue b/src/components/PageConnectInfoItems.vue
index 02f9b2f..e00d539 100644
--- a/src/components/PageConnectInfoItems.vue
+++ b/src/components/PageConnectInfoItems.vue
@@ -774,6 +774,17 @@
         class="mb-6">
         当前为容器模式，内置客户端被禁用。
       </el-alert>
+      <el-alert
+        v-if="
+          store.diceServers.length > 0 &&
+          store.diceServers[0].baseInfo.containerMode &&
+          (form.accountType === 16 || form.accountType === 0)
+        "
+        type="warning"
+        :closable="false"
+        class="mb-6">
+        当前为容器模式，内置 gocq 被禁用。
+      </el-alert>
 
       <el-form :model="form">
         <el-form-item label="账号类型" :label-width="formLabelWidth">
@@ -784,6 +795,12 @@
               :disabled="
                 store.diceServers.length > 0 && store.diceServers[0].baseInfo.containerMode
               "></el-option>
+            <el-option
+              label="QQ(内置gocq)"
+              :value="16"
+              :disabled="
+                store.diceServers.length > 0 && store.diceServers[0].baseInfo.containerMode
+              "></el-option>
             <el-option label="QQ(onebot11正向WS)" :value="6"></el-option>
             <el-option label="QQ(onebot11反向WS)" :value="11"></el-option>
             <el-option label="QQ(官方机器人)" :value="10"></el-option>
@@ -796,12 +813,6 @@
             <el-option label="Dodo语音" :value="5"></el-option>
             <el-option label="钉钉" :value="8"></el-option>
             <el-option label="Slack" :value="9"></el-option>
-            <el-option
-              label="[已弃用]QQ(内置gocq)"
-              :value="0"
-              :disabled="
-                store.diceServers.length > 0 && store.diceServers[0].baseInfo.containerMode
-              "></el-option>
             <el-option label="[已弃用]QQ(red协议)" :value="7"></el-option>
           </el-select>
         </el-form-item>
@@ -854,14 +865,14 @@
         </el-form-item> -->
 
         <el-form-item
-          v-if="form.accountType === 15"
+          v-if="form.accountType === 15 || form.accountType === 16"
           label="账号"
           :label-width="formLabelWidth"
           required>
           <el-input v-model="form.account" type="number" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item
-          v-if="form.accountType === 15"
+          v-if="form.accountType === 15 || form.accountType === 16"
           label="签名服务"
           :label-width="formLabelWidth"
           required>
@@ -872,14 +883,14 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item
-          v-if="form.accountType === 15 && form.signServerType === 2"
+          v-if="(form.accountType === 15 || form.accountType === 16) && form.signServerType === 2"
           label="自定义签名地址"
           :label-width="formLabelWidth"
           required>
           <el-input v-model="form.signServerUrl" type="text" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item
-          v-else-if="form.accountType === 15"
+          v-else-if="form.accountType === 15 || form.accountType === 16"
           label="签名版本"
           :label-width="formLabelWidth"
           required>
@@ -1756,7 +1767,7 @@
               (form.accountType === 9 && (form.botToken === '' || form.appToken === '')) ||
               (form.accountType === 11 && (form.account === '' || form.reverseAddr === '')) ||
               (form.accountType === 13 && (form.token === '' || form.url === '')) ||
-              (form.accountType === 15 &&
+              ((form.accountType === 15 || form.accountType === 16) &&
                 (form.account === '' || (form.signServerType === 2 && form.signServerUrl === '')))
             "
             @click="goStepTwo">
@@ -2024,7 +2035,7 @@ const goStepTwo = async () => {
   setRecentLogin();
   duringRelogin.value = false;
 
-  if (form.accountType === 15) {
+  if (form.accountType === 15 || form.accountType === 16) {
     switch (form.signServerType) {
       case 0:
         form.signServerUrl = 'sealdice';
@@ -2481,4 +2492,4 @@ const doRemove = async (i: DiceConnection) => {
 .the-dialog {
   min-width: 370px;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/store/index.ts b/src/store/index.ts
index d624c3b..d1be8f6 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -15,6 +15,7 @@ import {
   postAddGocqSeparate,
   postAddKook,
   postAddLagrange,
+  postAddLagrangeGocq,
   postAddMinecraft,
   postAddOfficialQQ,
   postAddOnebot11ReverseWs,
@@ -364,6 +365,15 @@ export const useStore = defineStore('main', {
             info = await postAddLagrange(account, signServerUrl, version);
           }
           break;
+        case 16:
+          {
+            let version = '';
+            if (signServerUrl === 'sealdice' || signServerUrl === 'lagrange') {
+              version = signServerVersion;
+            }
+            info = await postAddLagrangeGocq(account, signServerUrl, version);
+          }
+          break;
       }
       return info as DiceConnection;
     },
@@ -431,4 +441,4 @@ export const useStore = defineStore('main', {
       return this.token != '';
     },
   },
-});
+});
\ No newline at end of file

From 3a9e15733fad4f2fa245c60eef4c235e711dcbbe Mon Sep 17 00:00:00 2001
From: Fripine <Fripine@hotmail.com>
Date: Thu, 7 Nov 2024 19:08:48 +0800
Subject: [PATCH 2/6] lint

---
 src/api/im_connections/index.ts         | 2 +-
 src/components/PageConnectInfoItems.vue | 2 +-
 src/store/index.ts                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/im_connections/index.ts b/src/api/im_connections/index.ts
index 3e37d80..7625709 100644
--- a/src/api/im_connections/index.ts
+++ b/src/api/im_connections/index.ts
@@ -380,4 +380,4 @@ type ServerConfig = {
   url: string;
   key: string;
   authorization: string;
-};
\ No newline at end of file
+};
diff --git a/src/components/PageConnectInfoItems.vue b/src/components/PageConnectInfoItems.vue
index e00d539..4287773 100644
--- a/src/components/PageConnectInfoItems.vue
+++ b/src/components/PageConnectInfoItems.vue
@@ -2492,4 +2492,4 @@ const doRemove = async (i: DiceConnection) => {
 .the-dialog {
   min-width: 370px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/store/index.ts b/src/store/index.ts
index d1be8f6..502915a 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -441,4 +441,4 @@ export const useStore = defineStore('main', {
       return this.token != '';
     },
   },
-});
\ No newline at end of file
+});

From 53dadd8014c7c984b24f512bd8d7ae7258584f69 Mon Sep 17 00:00:00 2001
From: Fripine <Fripine@hotmail.com>
Date: Fri, 8 Nov 2024 14:47:55 +0800
Subject: [PATCH 3/6] delete postAddLagrangeGocq

---
 src/api/im_connections/index.ts | 20 ++------------------
 src/store/index.ts              |  5 ++---
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/api/im_connections/index.ts b/src/api/im_connections/index.ts
index 7625709..53f3f17 100644
--- a/src/api/im_connections/index.ts
+++ b/src/api/im_connections/index.ts
@@ -168,27 +168,11 @@ export function postAddSatori(platform: string, host: string, port: string, toke
   });
 }
 
-export function postAddLagrange(account: string, signServerUrl: string, signServerVersion: string) {
+export function postAddLagrange(account: string, signServerUrl: string, signServerVersion: string, isGocq: boolean) {
   return request<DiceConnection>(
     'post',
     'addLagrange',
-    { account, signServerUrl, signServerVersion },
-    'json',
-    {
-      timeout: 65000,
-    },
-  );
-}
-
-export function postAddLagrangeGocq(
-  account: string,
-  signServerUrl: string,
-  signServerVersion: string,
-) {
-  return request<DiceConnection>(
-    'post',
-    'addLagrangeGocq',
-    { account, signServerUrl, signServerVersion },
+    { account, signServerUrl, signServerVersion, isGocq },
     'json',
     {
       timeout: 65000,
diff --git a/src/store/index.ts b/src/store/index.ts
index 502915a..75cda55 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -15,7 +15,6 @@ import {
   postAddGocqSeparate,
   postAddKook,
   postAddLagrange,
-  postAddLagrangeGocq,
   postAddMinecraft,
   postAddOfficialQQ,
   postAddOnebot11ReverseWs,
@@ -362,7 +361,7 @@ export const useStore = defineStore('main', {
             if (signServerUrl === 'sealdice' || signServerUrl === 'lagrange') {
               version = signServerVersion;
             }
-            info = await postAddLagrange(account, signServerUrl, version);
+            info = await postAddLagrange(account, signServerUrl, version, false);
           }
           break;
         case 16:
@@ -371,7 +370,7 @@ export const useStore = defineStore('main', {
             if (signServerUrl === 'sealdice' || signServerUrl === 'lagrange') {
               version = signServerVersion;
             }
-            info = await postAddLagrangeGocq(account, signServerUrl, version);
+            info = await postAddLagrange(account, signServerUrl, version, true);
           }
           break;
       }

From 6f657effb337617a240a21e5824153d82574c193 Mon Sep 17 00:00:00 2001
From: Fripine <Fripine@hotmail.com>
Date: Fri, 8 Nov 2024 15:09:28 +0800
Subject: [PATCH 4/6] lint

---
 src/api/im_connections/index.ts         |  7 ++++++-
 src/components/PageConnectInfoItems.vue | 26 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/api/im_connections/index.ts b/src/api/im_connections/index.ts
index 53f3f17..b89b11a 100644
--- a/src/api/im_connections/index.ts
+++ b/src/api/im_connections/index.ts
@@ -168,7 +168,12 @@ export function postAddSatori(platform: string, host: string, port: string, toke
   });
 }
 
-export function postAddLagrange(account: string, signServerUrl: string, signServerVersion: string, isGocq: boolean) {
+export function postAddLagrange(
+  account: string,
+  signServerUrl: string,
+  signServerVersion: string,
+  isGocq: boolean,
+) {
   return request<DiceConnection>(
     'post',
     'addLagrange',
diff --git a/src/components/PageConnectInfoItems.vue b/src/components/PageConnectInfoItems.vue
index 4287773..ce37e0d 100644
--- a/src/components/PageConnectInfoItems.vue
+++ b/src/components/PageConnectInfoItems.vue
@@ -249,6 +249,32 @@
             </el-form-item>
           </template>
 
+          <template
+            v-if="
+              i.platform === 'QQ' &&
+              i.protocolType === 'onebot' &&
+              i.adapter.builtinMode === 'lagrange-gocq'
+            ">
+            <el-form-item label="接入方式">
+              <div>内置gocq</div>
+            </el-form-item>
+            <el-form-item label="签名地址">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="i.enable ? '禁用账号后方可修改签名服务地址' : '单击修改签名服务地址'"
+                placement="bottom">
+                <el-button
+                  :icon="Edit"
+                  size="small"
+                  circle
+                  :disabled="i.enable"
+                  style="margin-left: 0.5rem"
+                  @click="showSetSignServerDialog(i)" />
+              </el-tooltip>
+            </el-form-item>
+          </template>
+
           <template v-if="i.platform === 'QQ' && i.protocolType === 'red'">
             <el-form-item label="协议">
               <div>[已弃用]Red</div>

From 20b9b5f7f53149f3fbf2a0c7ae12b4df11728580 Mon Sep 17 00:00:00 2001
From: Fripine <Fripine@hotmail.com>
Date: Fri, 8 Nov 2024 15:41:10 +0800
Subject: [PATCH 5/6] add lagrange-gocq

---
 src/api/im_connections/index.ts         | 2 +-
 src/components/PageConnectInfoItems.vue | 6 ++----
 src/store/index.ts                      | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/api/im_connections/index.ts b/src/api/im_connections/index.ts
index b89b11a..a664730 100644
--- a/src/api/im_connections/index.ts
+++ b/src/api/im_connections/index.ts
@@ -283,7 +283,7 @@ interface AdapterQQ {
   appID: number;
   isReverse: boolean;
   reverseAddr: string;
-  builtinMode: 'gocq' | 'lagrange';
+  builtinMode: 'gocq' | 'lagrange' | 'lagrange-gocq';
 }
 enum goCqHttpStateCode {
   Init = 0,
diff --git a/src/components/PageConnectInfoItems.vue b/src/components/PageConnectInfoItems.vue
index ce37e0d..4f7f7e3 100644
--- a/src/components/PageConnectInfoItems.vue
+++ b/src/components/PageConnectInfoItems.vue
@@ -176,7 +176,7 @@
             v-if="
               i.platform === 'QQ' &&
               (i.protocolType === 'onebot' || i.protocolType === 'walle-q') &&
-              i.adapter.builtinMode !== 'lagrange'
+              i.adapter.builtinMode === 'gocq'
             ">
             <!-- <el-form-item label="忽略好友请求">
               <div>{{i.adapter?.ignoreFriendRequest ? '是' : '否'}}</div>
@@ -298,9 +298,7 @@
 
           <template
             v-if="
-              i.platform === 'QQ' &&
-              i.protocolType === 'onebot' &&
-              i.adapter.builtinMode !== 'lagrange'
+              i.platform === 'QQ' && i.protocolType === 'onebot' && i.adapter.builtinMode === 'gocq'
             ">
             <el-form-item label="其他">
               <el-tooltip content="导出gocq设置，用于转分离部署" placement="top-start">
diff --git a/src/store/index.ts b/src/store/index.ts
index 75cda55..c556b6b 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -65,7 +65,7 @@ export interface AdapterQQ {
   appID: number;
   isReverse: boolean;
   reverseAddr: string;
-  builtinMode: 'gocq' | 'lagrange';
+  builtinMode: 'gocq' | 'lagrange' | 'lagrange-gocq';
 }
 
 interface TalkLogItem {

From ccb9e4c6660dc43ed81825ffe2f4faa3e565991a Mon Sep 17 00:00:00 2001
From: Fripine <Fripine@hotmail.com>
Date: Wed, 4 Dec 2024 00:29:13 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E5=AE=89=E5=8D=93=E4=B8=8Emac?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=BB=98=E8=AE=A4=E8=B4=A6=E5=8F=B7=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=86=85=E7=BD=AEgocq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

嵌套三目不好，我直接拆出来放onBeforeMount钩子里
---
 src/components/PageConnectInfoItems.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/PageConnectInfoItems.vue b/src/components/PageConnectInfoItems.vue
index 4f7f7e3..17460b6 100644
--- a/src/components/PageConnectInfoItems.vue
+++ b/src/components/PageConnectInfoItems.vue
@@ -2350,10 +2350,8 @@ const handleSignServerDelete = (url: string) => {
 
 const supportedQQVersions = ref<string[]>([]);
 
-const defaultAccountType: number =
-  store.diceServers.length > 0 && store.diceServers[0].baseInfo.containerMode ? 6 : 15;
 const form = reactive({
-  accountType: defaultAccountType,
+  accountType: 15,
   step: 1,
   isEnd: false,
   account: '',
@@ -2433,6 +2431,19 @@ onBeforeMount(async () => {
     supportedQQVersions.value = ['', ...versionsRes.versions];
   }
 
+  // form.accountType默认账号类型，在android与mac系统中，默认账号类型为内置gocq，其余系统为内置客户端
+  if (store.diceServers.length > 0) {
+    if (
+      store.diceServers[0].baseInfo.OS === 'android' ||
+      store.diceServers[0].baseInfo.OS === 'darwin'
+    ) {
+      form.accountType = 16;
+    }
+    if (store.diceServers[0].baseInfo.containerMode) {
+      form.accountType = 6;
+    }
+  }
+
   timerId = setInterval(async () => {
     console.log('refresh');
     await store.getImConnections();