Skip to content

Commit

Permalink
feat(Lagrange): 支持设置内置拉格兰的签名版本 (#230)
Browse files Browse the repository at this point in the history
* feat(Lagrange): 支持设置内置拉格兰的签名版本

* feat: 微调版本展示值
  • Loading branch information
JustAnotherID authored Jul 31, 2024
1 parent ad02484 commit 2ec59fe
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 6 deletions.
24 changes: 22 additions & 2 deletions src/components/PageConnectInfoItems.vue
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,15 @@
<el-form-item v-if="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 label="签名版本" :label-width="formLabelWidth" required>
<el-space direction="vertical" alignment="flex-start">
<el-radio-group v-model="form.signServerVersion">
<el-radio value="13107">13107</el-radio>
<el-radio value="25765">25765</el-radio>
</el-radio-group>
<el-text type="warning" size="small">如果不知道这是什么,请保持默认选中的最新版本</el-text>
</el-space>
</el-form-item>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogSetSignServerVisible = false">取消</el-button>
Expand Down Expand Up @@ -595,6 +604,15 @@
: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" label="签名版本" :label-width="formLabelWidth" required>
<el-space direction="vertical" alignment="flex-start">
<el-radio-group v-model="form.signServerVersion">
<el-radio value="13107">13107</el-radio>
<el-radio value="25765">25765</el-radio>
</el-radio-group>
<el-text type="warning" size="small">如果不知道这是什么,请保持默认选中的最新版本</el-text>
</el-space>
</el-form-item>

<el-form-item v-if="form.accountType === 0" label="账号" :label-width="formLabelWidth" required>
<el-input v-model="form.account" type="number" autocomplete="off"></el-input>
Expand Down Expand Up @@ -1461,7 +1479,7 @@ const doSetData = async () => {
}
const showSetSignServerDialog = async (i: DiceConnection) => {
form.endpoint = i;
const ret = await store.getImConnectionsSetSignServerUrl(form.endpoint, "",false);
const ret = await store.getImConnectionsSetSignServerUrl(form.endpoint, "",false, form.signServerVersion);
if (ret.result) {
form.signServerUrl = ret.signServerUrl
switch (form.signServerUrl) {
Expand All @@ -1477,6 +1495,7 @@ const showSetSignServerDialog = async (i: DiceConnection) => {
form.signServerType = 2;
break;
}
form.signServerVersion = ret.signServerVersion
dialogSetSignServerVisible.value = true;
} else {
ElMessage.error(ret.err)
Expand All @@ -1492,7 +1511,7 @@ const doSetSignServer = async() =>{
form.signServerUrl = "lagrange";
break;
}
const ret = await store.getImConnectionsSetSignServerUrl(form.endpoint, form.signServerUrl,true);
const ret = await store.getImConnectionsSetSignServerUrl(form.endpoint, form.signServerUrl, true, form.signServerVersion);
if (ret.result) {
ElMessage.success('修改完成,请手动启用账号以生效');
} else {
Expand Down Expand Up @@ -1675,6 +1694,7 @@ const form = reactive({
signServerType: 0,
signServerUrl: '',
signServerKey: '',
signServerVersion: '25765',
reverseAddr: ':4001',
platform: 'QQ',
Expand Down
2 changes: 1 addition & 1 deletion src/components/PageHome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</div>

<el-divider class="latest-log-warn">
<el-text type="warning" size="small" class="hover:cursor-pointer" @click="scrollDown">点击下拉到底查看最新日志</el-text>
<el-text type="warning" size="small" class="hover:cursor-pointer" @click="scrollDown">点击下拉到底查看最新</el-text>
</el-divider>

<div class="hidden md:block p-0 logs">
Expand Down
16 changes: 13 additions & 3 deletions src/store/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ export const useStore = defineStore('main', {
useSignServer,
signServerConfig,
signServerUrl,
signServerVersion,
reverseAddr,
onlyQQGuild,
platform } = form
Expand Down Expand Up @@ -350,7 +351,11 @@ export const useStore = defineStore('main', {
info = await backend.post(urlPrefix + '/im_connections/addSatori', { platform, host, port, token }, { timeout: 65000 })
break
case 15:
info = await backend.post(urlPrefix + '/im_connections/addLagrange', { account, signServerUrl }, { timeout: 65000 })
let version = ""
if (signServerUrl === "sealdice" || signServerUrl === "lagrange") {
version = signServerVersion
}
info = await backend.post(urlPrefix + '/im_connections/addLagrange', { account, signServerUrl, signServerVersion: version }, { timeout: 65000 })
break
}
return info as any as DiceConnection
Expand Down Expand Up @@ -387,8 +392,13 @@ export const useStore = defineStore('main', {
return info as any as DiceConnection
},

async getImConnectionsSetSignServerUrl(i: DiceConnection, signServerUrl: string, w: boolean) {
const info: { result: false, err: string } | { result: true ,signServerUrl:string} = await backend.post(urlPrefix + '/im_connections/set_sign_server', { id: i.id, signServerUrl, w })
async getImConnectionsSetSignServerUrl(i: DiceConnection, signServerUrl: string, w: boolean, signServerVersion: string) {
let version = ""
if (signServerUrl === "sealdice" || signServerUrl === "lagrange") {
version = signServerVersion
}
const info: { result: false, err: string } | { result: true ,signServerUrl:string, signServerVersion: string} =
await backend.post(urlPrefix + '/im_connections/set_sign_server', { id: i.id, signServerUrl, w, signServerVersion: version })
return info
},

Expand Down

0 comments on commit 2ec59fe

Please sign in to comment.