diff --git a/src/components/InstallCsApp.vue b/_deprecated/InstallCsApp.vue similarity index 90% rename from src/components/InstallCsApp.vue rename to _deprecated/InstallCsApp.vue index e6ecbd3..d483046 100644 --- a/src/components/InstallCsApp.vue +++ b/_deprecated/InstallCsApp.vue @@ -28,9 +28,9 @@ diff --git a/src/views/auth/LoginView.vue b/src/views/auth/LoginView.vue index 14836b4..b95d410 100644 --- a/src/views/auth/LoginView.vue +++ b/src/views/auth/LoginView.vue @@ -9,7 +9,6 @@ require-mark-placement="right-hanging" size="medium" id="item" - v-show="!other_login" > QQ 登录 - + 登录 @@ -44,12 +43,6 @@ -
- -
@@ -57,19 +50,18 @@ + + diff --git a/src/views/callback/auth/oauth/qq/LoginView.vue b/src/views/callback/auth/oauth/qq/LoginView.vue new file mode 100644 index 0000000..4ac8ad6 --- /dev/null +++ b/src/views/callback/auth/oauth/qq/LoginView.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/callback/verification/realperson/DoneView.vue b/src/views/callback/verification/realperson/DoneView.vue new file mode 100644 index 0000000..02b8cda --- /dev/null +++ b/src/views/callback/verification/realperson/DoneView.vue @@ -0,0 +1,19 @@ + + + diff --git a/src/views/callback/verification/realperson/PayView.vue b/src/views/callback/verification/realperson/PayView.vue new file mode 100644 index 0000000..359387d --- /dev/null +++ b/src/views/callback/verification/realperson/PayView.vue @@ -0,0 +1,19 @@ + + + diff --git a/src/views/games/MinecraftView.vue b/src/views/games/MinecraftView.vue new file mode 100644 index 0000000..2956f1b --- /dev/null +++ b/src/views/games/MinecraftView.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/views/proxies/AddView.vue b/src/views/proxies/AddView.vue index 280f581..1a57830 100644 --- a/src/views/proxies/AddView.vue +++ b/src/views/proxies/AddView.vue @@ -29,12 +29,12 @@ v-model:value="proxyInfo.proxy_type" @update:value="proxyTypeSelectChangeHandle" > - TCP - UDP - HTTP - HTTPS - XTCP - STCP + TCP + UDP + HTTP + HTTPS + XTCP + STCP
@@ -114,7 +114,7 @@ const formRef = ref(null) const proxyInfo = ref({ node: 0, proxy_name: '', - proxy_type: '1', + proxy_type: 'tcp', local_ip: '127.0.0.1', local_port: null, remote_port: null, @@ -217,8 +217,8 @@ const showDomainInput = ref(false) const showSecretKeyInput = ref(false) function proxyTypeSelectChangeHandle(value) { - showDomainInput.value = value === '3' || value === '4' - showSecretKeyInput.value = value === '5' || value === '6' + showDomainInput.value = value === 'http' || value === 'https' + showSecretKeyInput.value = value === 'xtcp' || value === 'stcp' } async function randomPort() { @@ -247,34 +247,30 @@ async function addProxy() { const tunnelCreateInfo = { username: userData.getters.get_username, name: proxyInfo.value.proxy_name, - key: userData.getters.get_frp_token, ip: proxyInfo.value.local_ip, type: proxyInfo.value.proxy_type, lp: proxyInfo.value.local_port, rp: proxyInfo.value.remote_port, - ue: '0', - uz: '0', + ue: false, + uz: false, id: proxyInfo.value.node, - token: userData.getters.get_token, url: proxyInfo.value.domain, sk: proxyInfo.value.sk } let rs try { - rs = await api.v2.proxies.add( + rs = await api.v2.proxy.root.post( tunnelCreateInfo.username, tunnelCreateInfo.name, - tunnelCreateInfo.key, tunnelCreateInfo.ip, tunnelCreateInfo.type, tunnelCreateInfo.lp, tunnelCreateInfo.rp, + tunnelCreateInfo.id, tunnelCreateInfo.ue, tunnelCreateInfo.uz, - tunnelCreateInfo.id, - tunnelCreateInfo.token, - tunnelCreateInfo.url, - tunnelCreateInfo.sk + tunnelCreateInfo.sk, + tunnelCreateInfo.url ) } catch (e) { logger.error(e) @@ -283,11 +279,7 @@ async function addProxy() { } if (!rs) return if (rs.status === 200) { - if (rs.statusApi === 200) { - sendSuccessDialog('添加成功') - } else { - sendErrorMessage(rs.message) - } + sendSuccessDialog('添加成功') } else { sendErrorMessage(rs.message) } @@ -296,14 +288,14 @@ async function addProxy() { onMounted(async () => { let rs try { - rs = await api.v2.nodes.list() + rs = await api.v2.node.all() } catch (e) { logger.error(e) sendErrorMessage('请求节点列表失败: ' + e) } if (!rs) return var i = 0 - rs.data.forEach((s) => { + rs.data.list.forEach((s) => { // 默认选择第一个节点 if (i === 0) { proxyInfo.value.node = s.id diff --git a/src/views/proxies/ConfigView.vue b/src/views/proxies/ConfigView.vue index 4c7c790..2bed4f6 100644 --- a/src/views/proxies/ConfigView.vue +++ b/src/views/proxies/ConfigView.vue @@ -91,14 +91,14 @@ const code = ref('') onMounted(async () => { let rs try { - rs = await api.v2.nodes.list() + rs = await api.v2.node.all() } catch (e) { logger.error(e) sendErrorMessage('请求节点列表失败: ' + e) } if (!rs) return var i = 0 - rs.data.forEach((s) => { + rs.data.list.forEach((s) => { if (i === 0) { node.value = s.id updateValue(s.id) @@ -114,17 +114,13 @@ onMounted(async () => { async function updateValue(value) { let rs try { - rs = await api.v1.Proxies.GetConfigFile( - userData.getters.get_username, - userData.getters.get_token, - value - ) + rs = await api.v2.proxy.config(userData.getters.get_username, null, value) } catch (e) { logger.error(e) sendErrorMessage('请求获取隧道配置文件失败: ' + e) } if (!rs) return - if (rs.data.status) { + if (rs.status === 200) { sendSuccessMessage(rs.message) code.value = rs.data.config } else { diff --git a/src/views/proxies/ProxiesView.vue b/src/views/proxies/ProxiesView.vue index 76d79e7..d819e96 100644 --- a/src/views/proxies/ProxiesView.vue +++ b/src/views/proxies/ProxiesView.vue @@ -1,5 +1,4 @@ -